diff --git a/templates/account/settings.tpl b/templates/account/settings.tpl
index c5f3d1f..4b98b93 100644
--- a/templates/account/settings.tpl
+++ b/templates/account/settings.tpl
@@ -170,6 +170,20 @@
 				</div>
 			</div>
 
+			<h4>[[user:follow]]</h4>
+			<div class="well">
+				<div class="checkbox">
+					<label>
+						<input type="checkbox" data-property="followTopicsOnCreate" <!-- IF settings.followTopicsOnCreate -->checked <!-- ENDIF settings.followTopicsOnCreate -->/> <strong>[[user:follow_topics_you_create]]</strong>
+					</label>
+				</div>
+				<div class="checkbox">
+					<label>
+						<input type="checkbox" data-property="followTopicsOnReply" <!-- IF settings.followTopicsOnReply -->checked<!-- ENDIF settings.followTopicsOnReply -->/> <strong>[[user:follow_topics_you_reply_to]]</strong>
+					</label>
+				</div>
+			</div>
+
 
 			<h4>[[global:header.notifications]]</h4>
 			<div class="well">