diff --git a/ruqqus/templates/settings.html b/ruqqus/templates/settings.html
index ebc3e2b77..6a838038b 100644
--- a/ruqqus/templates/settings.html
+++ b/ruqqus/templates/settings.html
@@ -1,8 +1,37 @@
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
+
+	{% include "bootstrap.html" %}
+	
 	<script>
+		//email change
+
+		// Show confirm password field when user clicks email box
+
+		$('#new_email').on('input', function () {
+
+			var id = document.getElementById("email-password");
+			var id2 = document.getElementById("email-password-label");
+			var id3 = document.getElementById("emailpasswordRequired");
+
+			id.classList.remove("d-none");
+			id2.classList.remove("d-none");
+			id3.classList.remove("d-none");
+
+		});
+	
+		// 2FA toggle modal
+
+		$('#2faModal').on('hidden.bs.modal', function () {
+
+			var box = document.getElementById("2faToggle");
+			
+			box.checked = !box.checked;
+
+		});
+
+	
 		//Email verification text
 
 		function emailVerifyText() {
@@ -188,9 +217,6 @@
 </div>
 {% endblock %}
 
-{% include "bootstrap.html" %}
-
-
 
 <!-- ClipboardJS -->
 
diff --git a/ruqqus/templates/submit.html b/ruqqus/templates/submit.html
index a238c339e..5a53b6a30 100644
--- a/ruqqus/templates/submit.html
+++ b/ruqqus/templates/submit.html
@@ -6,14 +6,14 @@
 
 		<script>
 		
-		$(document).ready(function() {
-			$('#submitform').submit(function() {
-					// disable button
-					$("#create_button").prop("disabled", true);
-					// add spinner to button
-					$("#create_button").html('<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Creating post');
+			$(document).ready(function() {
+				$('#submitform').submit(function() {
+						// disable button
+						$("#create_button").prop("disabled", true);
+						// add spinner to button
+						$("#create_button").html('<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Creating post');
+					});
 				});
-			});
 
 			// Text Formatting
 
