diff --git a/templates/footer.tpl b/templates/footer.tpl
index 48d84c8..e31d904 100644
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -16,15 +16,19 @@
 		</div>
 	</div>
 
-	<script async src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>
+	<script defer src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>
 
 	<!-- BEGIN scripts -->
-	<script async defer type="text/javascript" src="{scripts.src}"></script>
+	<script defer type="text/javascript" src="{scripts.src}"></script>
 	<!-- END scripts -->
 
 	<script>
 		window.addEventListener('load', function () {
 			require(['forum/footer']);
+
+			<!-- IF useCustomJS -->
+			{{customJS}}
+			<!-- ENDIF useCustomJS -->
 		});
 	</script>
 
diff --git a/templates/header.tpl b/templates/header.tpl
index a8f805e..0a6bbfc 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -16,12 +16,12 @@
 		};
 	</script>
 
-	<!-- IF useCustomJS -->
-	{{customJS}}
-	<!-- ENDIF useCustomJS -->
+	<!-- IF useCustomHTML -->
+	{{customHTML}}
+	<!-- END -->
 	<!-- IF useCustomCSS -->
 	<style type="text/css">{{customCSS}}</style>
-	<!-- ENDIF useCustomCSS -->
+	<!-- END -->
 </head>
 
 <body class="{bodyClass} skin-{config.bootswatchSkin}">
