diff --git a/files/routes/posts.py b/files/routes/posts.py
index 931fa1b7b..0302c3dde 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -704,7 +704,7 @@ def submit_post(v):
 		parsed_url = urlparse(url)
 
 		domain = parsed_url.netloc
-		if domain in ('old.reddit.com','twitter.com'):
+		if domain == 'old.reddit.com':
 			new_url = ParseResult(scheme="https",
 					netloc=parsed_url.netloc,
 					path=parsed_url.path,
diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html
index dedcbc4ad..fbee12f8a 100644
--- a/files/templates/settings_security.html
+++ b/files/templates/settings_security.html
@@ -68,6 +68,16 @@
 
 			<form action="/settings/security" method="post">
 
+				<div class="d-lg-flex mt-5">
+
+					<label for="old_password" class="mb-0 w-lg-25">Old Password</label>
+	
+					<input autocomplete="off" class="form-control mb-2 w-lg-100" id="old_password"
+					aria-describedby="old_password" type="password" name="old_password"
+					required>
+	
+				</div>
+	
 				<div class="body">
 
 					<div class="d-lg-flex">
@@ -106,16 +116,6 @@
 
 			</div>
 
-			<div class="d-lg-flex mt-5">
-
-				<label for="old_password" class="mb-0 w-lg-25">Old Password</label>
-
-				<input autocomplete="off" class="form-control mb-2 w-lg-100" id="old_password"
-				aria-describedby="old_password" type="password" name="old_password"
-				required>
-
-			</div>
-
 		</div>
 
 		<div class="footer">