diff --git a/public/src/app.js b/public/src/app.js
index 836748641f..f7734ab588 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -15,6 +15,9 @@ var socket,
 			url: RELATIVE_PATH + '/api/config',
 			success: function (data) {
 				config = data;
+
+				exposeConfigToTemplates();
+
 				if(socket) {
 					socket.disconnect();
 					setTimeout(function() {
@@ -591,13 +594,17 @@ var socket,
 		});
 
 		createHeaderTooltips();
-
-		templates.setGlobal('relative_path', RELATIVE_PATH);
-		templates.setGlobal('usePagination', config.usePagination);
-		templates.setGlobal('topicsPerPage', config.topicsPerPage);
-		templates.setGlobal('postsPerPage', config.postsPerPage);
 	});
 
+	function exposeConfigToTemplates() {
+		$(document).ready(function() {
+			templates.setGlobal('relative_path', RELATIVE_PATH);
+			for(var key in config) {
+				templates.setGlobal('config.' + key, config[key]);
+			}
+		});
+	}
+
 	function createHeaderTooltips() {
 		$('#header-menu li i[title]').each(function() {
 			$(this).parents('a').tooltip({
diff --git a/public/templates/category.tpl b/public/templates/category.tpl
index 440cf48a09..48971a5265 100644
--- a/public/templates/category.tpl
+++ b/public/templates/category.tpl
@@ -86,14 +86,14 @@
 			</li>
 			<!-- END topics -->
 		</ul>
-		<!-- IF usePagination -->
+		<!-- IF config.usePagination -->
 		<div class="text-center">
 			<ul class="pagination">
 				<li class="previous pull-left"><a href="#"><i class="fa fa-chevron-left"></i> [[global:previouspage]]</a></li>
 				<li class="next pull-right"><a href="#">[[global:nextpage]] <i class="fa fa-chevron-right"></i></a></li>
 			</ul>
 		</div>
-		<!-- ENDIF usePagination -->
+		<!-- ENDIF config.usePagination -->
 	</div>
 
 	<!-- IF topics.length -->
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index c6eeaeb2df..4666bc639e 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -214,14 +214,14 @@
 		<div style="clear:both;"></div>
 	</div>
 
-	<!-- IF usePagination -->
+	<!-- IF config.usePagination -->
 	<div class="text-center">
 		<ul class="pagination">
 			<li class="previous pull-left"><a href="#"><i class="fa fa-chevron-left"></i> [[global:previouspage]]</a></li>
 			<li class="next pull-right"><a href="#">[[global:nextpage]] <i class="fa fa-chevron-right"></i></a></li>
 		</ul>
 	</div>
-	<!-- ENDIF usePagination -->
+	<!-- ENDIF config.usePagination -->
 
 	<div id="move_thread_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="Move Topic" aria-hidden="true">
 		<div class="modal-dialog">