diff --git a/public/language/en_GB/global.json b/public/language/en_GB/global.json
index 910bde29f4..40e0f8ed98 100644
--- a/public/language/en_GB/global.json
+++ b/public/language/en_GB/global.json
@@ -62,5 +62,7 @@
 	"away": "Away",
 	"dnd": "Do not Disturb",
 	"invisible": "Invisible",
-	"offline": "Offline"
+	"offline": "Offline",
+
+	"privacy": "Privacy"
 }
diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json
index 1526809f45..210d9da4d9 100644
--- a/public/language/en_GB/user.json
+++ b/public/language/en_GB/user.json
@@ -40,5 +40,9 @@
 	"has_no_posts": "This user didn't post anything yet.",
 
 	"email_hidden": "Email Hidden",
-	"hidden": "hidden"
+	"hidden": "hidden",
+
+	"paginate_description" : "Paginate topics and posts instead of using infinite scroll.",
+	"topics_per_page": "Topics per Page",
+	"posts_per_page": "Posts per Page"
 }
diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl
index b6c3e62c96..98d32c2054 100644
--- a/public/templates/accountsettings.tpl
+++ b/public/templates/accountsettings.tpl
@@ -8,12 +8,14 @@
 		<div class="col-md-6">
 			<div class="panel panel-default">
 				<div class="panel-body">
-					<h4>privacy</h4>
 					<div class="checkbox">
 						<label>
-							<input id="showemailCheckBox" type="checkbox" <!-- IF settings.showemail -->checked<!-- ENDIF settings.showemail --> > [[user:show_email]]
+							<input id="usePaginationCheckBox" type="checkbox" <!-- IF settings.usePagination -->checked<!-- ENDIF settings.usePagination -->> <strong>[[user:paginate_description]]</strong>
 						</label>
 					</div>
+
+					<strong>[[user:topics_per_page]]</strong><br /> <input id="topicsPerPage" type="text" class="form-control" value="{settings.topicsPerPage}"><br />
+					<strong>[[user:posts_per_page]]</strong><br /> <input id="postsPerPage" type="text" class="form-control" value="{settings.postsPerPage}"><br />
 				</div>
 			</div>
 		</div>
@@ -21,18 +23,17 @@
 		<div class="col-md-6">
 			<div class="panel panel-default">
 				<div class="panel-body">
+					<h4>[[global:privacy]]</h4>
 					<div class="checkbox">
 						<label>
-							<input id="usePaginationCheckBox" type="checkbox" <!-- IF settings.usePagination -->checked<!-- ENDIF settings.usePagination -->> <strong>Paginate topics and posts instead of using infinite scroll.</strong>
+							<input id="showemailCheckBox" type="checkbox" <!-- IF settings.showemail -->checked<!-- ENDIF settings.showemail --> > [[user:show_email]]
 						</label>
 					</div>
-
-					<strong>Topics per Page</strong><br /> <input id="topicsPerPage" type="text" class="form-control" value="{settings.topicsPerPage}"><br />
-					<strong>Posts per Page</strong><br /> <input id="postsPerPage" type="text" class="form-control" value="{settings.postsPerPage}"><br />
 				</div>
 			</div>
 		</div>
 	</div>
+
 	<div class="form-actions">
 		<a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a>
 	</div>