diff --git a/templates/account/settings.tpl b/templates/account/settings.tpl
index c60de70..1c7ad79 100644
--- a/templates/account/settings.tpl
+++ b/templates/account/settings.tpl
@@ -7,12 +7,12 @@
 			<div class="well">
 				<div class="checkbox">
 					<label>
-						<input type="checkbox" data-property="openOutgoingLinksInNewTab" /> <strong>[[user:open_links_in_new_tab]]</strong>
+						<input type="checkbox" data-property="openOutgoingLinksInNewTab" <!-- IF settings.openOutgoingLinksInNewTab -->checked<!-- ENDIF settings.openOutgoingLinksInNewTab -->/> <strong>[[user:open_links_in_new_tab]]</strong>
 					</label>
 				</div>
 				<div class="checkbox">
 					<label>
-						<input type="checkbox" data-property="topicSearchEnabled" /> <strong>[[user:enable_topic_searching]]</strong>
+						<input type="checkbox" data-property="topicSearchEnabled" <!-- IF settings.topicSearchEnabled -->checked<!-- ENDIF settings.topicSearchEnabled -->/> <strong>[[user:enable_topic_searching]]</strong>
 					</label>
 				</div>
 				<p class="help-block">[[user:topic_search_help]]</p>
@@ -22,17 +22,17 @@
 			<div class="well">
 				<div class="checkbox">
 					<label>
-						<input type="checkbox" data-property="showemail" /> <strong>[[user:show_email]]</strong>
+						<input type="checkbox" data-property="showemail" <!-- IF settings.showemail -->checked <!-- ENDIF settings.showemail -->/> <strong>[[user:show_email]]</strong>
 					</label>
 				</div>
 				<div class="checkbox">
 					<label>
-						<input type="checkbox" data-property="showfullname" /> <strong>[[user:show_fullname]]</strong>
+						<input type="checkbox" data-property="showfullname" <!-- IF settings.showfullname -->checked<!-- ENDIF settings.showfullname -->/> <strong>[[user:show_fullname]]</strong>
 					</label>
 				</div>
 				<div class="checkbox">
 					<label>
-						<input type="checkbox" data-property="restrictChat" /> <strong>[[user:restrict_chats]]</strong>
+						<input type="checkbox" data-property="restrictChat" <!-- IF settings.restrictChat -->checked<!-- ENDIF settings.restrictChat -->/> <strong>[[user:restrict_chats]]</strong>
 					</label>
 				</div>
 			</div>
@@ -43,23 +43,22 @@
 				<div class="form-group">
 					<label for="dailyDigestFreq">[[user:digest_label]]</label>
 					<select class="form-control" id="dailyDigestFreq" data-property="dailyDigestFreq">
-						<option value="off">[[user:digest_off]]</option>
-						<option value="day">[[user:digest_daily]]</option>
-						<option value="week">[[user:digest_weekly]]</option>
-						<option value="month">[[user:digest_monthly]]</option>
+						<!-- BEGIN dailyDigestFreqOptions -->
+						<option value="{dailyDigestFreqOptions.value}" <!-- IF dailyDigestFreqOptions.selected -->selected<!-- ENDIF dailyDigestFreqOptions.selected -->>{dailyDigestFreqOptions.name}</option>
+						<!-- END dailyDigestFreqOptions -->
 					</select>
 					<p class="help-block">[[user:digest_description]]</p>
 				</div>
 
 				<div class="checkbox">
 					<label>
-						<input type="checkbox" data-property="sendChatNotifications" /> <strong>[[user:send_chat_notifications]]</strong>
+						<input type="checkbox" data-property="sendChatNotifications" <!-- IF settings.sendChatNotifications -->checked<!-- ENDIF settings.sendChatNotifications -->/> <strong>[[user:send_chat_notifications]]</strong>
 					</label>
 				</div>
 
 				<div class="checkbox">
 					<label>
-						<input type="checkbox" data-property="sendPostNotifications" /> <strong>[[user:send_post_notifications]]</strong>
+						<input type="checkbox" data-property="sendPostNotifications" <!-- IF settings.sendPostNotifications -->checked<!-- ENDIF settings.sendPostNotifications -->/> <strong>[[user:send_post_notifications]]</strong>
 					</label>
 				</div>
 			</div>
@@ -69,12 +68,12 @@
 			<div class="well">
 				<div class="checkbox">
 					<label>
-						<input type="checkbox" data-property="followTopicsOnCreate"> <strong>[[user:follow_topics_you_create]]</strong>
+						<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"> <strong>[[user:follow_topics_you_reply_to]]</strong>
+						<input type="checkbox" data-property="followTopicsOnReply" <!-- IF settings.followTopicsOnReply -->checked<!-- ENDIF settings.followTopicsOnReply -->/> <strong>[[user:follow_topics_you_reply_to]]</strong>
 					</label>
 				</div>
 			</div>
@@ -87,7 +86,7 @@
 						<option value="">[[user:no-group-title]]</option>
 						<!-- BEGIN userGroups -->
 						<!-- IF userGroups.userTitleEnabled -->
-						<option value="{userGroups.name}">{userGroups.userTitle}</option>
+						<option value="{userGroups.name}" <!-- IF userGroups.selected -->selected<!-- ENDIF userGroups.selected -->>{userGroups.userTitle}</option>
 						<!-- ENDIF userGroups.userTitleEnabled -->
 						<!-- END userGroups -->
 					</select>
@@ -99,19 +98,19 @@
 			<div class="well">
 				<div class="checkbox">
 					<label>
-						<input type="checkbox" data-property="usePagination"> <strong>[[user:paginate_description]]</strong>
+						<input type="checkbox" data-property="usePagination" <!-- IF settings.usePagination -->checked<!-- ENDIF settings.usePagination -->> <strong>[[user:paginate_description]]</strong>
 					</label>
 				</div>
 
-				<strong>[[user:topics_per_page]]</strong><br /> <input type="text" class="form-control" data-property="topicsPerPage"><br />
-				<strong>[[user:posts_per_page]]</strong><br /> <input type="text" class="form-control" data-property="postsPerPage"><br />
+				<strong>[[user:topics_per_page]]</strong><br /> <input type="text" class="form-control" data-property="topicsPerPage" value="{settings.topicsPerPage}"><br />
+				<strong>[[user:posts_per_page]]</strong><br /> <input type="text" class="form-control" data-property="postsPerPage" value="{settings.postsPerPage}"><br />
 			</div>
 
 			<h4>[[global:header.notifications]]</h4>
 			<div class="well">
 				<div class="checkbox">
 					<label>
-						<input type="checkbox" data-property="notificationSounds"> <strong>[[user:notification_sounds]]</strong>
+						<input type="checkbox" data-property="notificationSounds" <!-- IF settings.notificationSounds -->checked<!-- ENDIF settings.notificationSounds -->> <strong>[[user:notification_sounds]]</strong>
 					</label>
 				</div>
 			</div>
@@ -120,7 +119,7 @@
 			<div class="well">
 				<select data-property="userLang" class="form-control">
 					<!-- BEGIN languages -->
-					<option value="{languages.code}">{languages.name} ({languages.code})</option>
+					<option value="{languages.code}" <!-- IF languages.selected -->selected<!-- ENDIF languages.selected -->>{languages.name} ({languages.code})</option>
 					<!-- END languages -->
 				</select>
 			</div>