diff --git a/files/templates/CHRISTMAS/settings.html b/files/templates/CHRISTMAS/settings.html
index cd12bab139..cb1ffa28c1 100644
--- a/files/templates/CHRISTMAS/settings.html
+++ b/files/templates/CHRISTMAS/settings.html
@@ -220,9 +220,9 @@
 	<script src="/assets/CHRISTMAS/js/mobile_navigation_bar.js?a=1"></script>
 
 	{% if v %}
-		<script>function formkey() {return '{{v.formkey}}';}</script>
-
 		<script>
+			function formkey() {return '{{v.formkey}}';}
+
 			var previousTheme = '{{ v.theme2 }}'.split(' ');
 			function changeTheme(theme) {
 				const root = document.documentElement
@@ -235,7 +235,10 @@
 				// Set global previous selection to current selection
 				previousTheme = theme;
 			}
+
+			const twoStepModal = new bootstrap.Modal(document.getElementById('2faModal'));
 		</script>
+
 	{% endif %}
 
 	<script src="/assets/CHRISTMAS/js/default.js?a=1"></script>
diff --git a/files/templates/CHRISTMAS/settings_security.html b/files/templates/CHRISTMAS/settings_security.html
index d78f882962..f19bdae0b6 100644
--- a/files/templates/CHRISTMAS/settings_security.html
+++ b/files/templates/CHRISTMAS/settings_security.html
@@ -267,6 +267,5 @@
 			document.getElementById("emailpasswordRequired").classList.remove("hidden");
 		});
 	});
-	const twoStepModal = new bootstrap.Modal(document.getElementById('2faModal'))
 </script>
 {% endblock %}