diff --git a/pages/edit-otp.go.html b/pages/edit-otp.go.html
index 6b067ac..c812558 100644
--- a/pages/edit-otp.go.html
+++ b/pages/edit-otp.go.html
@@ -17,7 +17,7 @@
         <p style="display:none">Raw OTP string: {{.OtpUrl}}</p>
         <div>
             <label for="field_code">OTP Code:</label>
-            <input type="text" name="code" id="field_code" required pattern="[0-9]{6,8}" title="6/7/8 digit one time passcode"/>
+            <input type="text" name="code" id="field_code" required autofocus pattern="[0-9]{6,8}" title="6/7/8 digit one time passcode"/>
         </div>
         <button type="submit">Login</button>
     </form>
diff --git a/pages/edit-password.go.html b/pages/edit-password.go.html
index e69de29..99e1cbc 100644
--- a/pages/edit-password.go.html
+++ b/pages/edit-password.go.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>{{.ServiceName}}</title>
+</head>
+<body>
+<header>
+    <h1>{{.ServiceName}}</h1>
+</header>
+<main>
+    <form method="POST" action="/edit/password">
+        <div>
+            <label for="field_password">Current Password:</label>
+            <input type="password" name="password" id="field_password" autocomplete="password" autofocus required/>
+        </div>
+        <div>
+            <label for="field_password">New Password:</label>
+            <input type="password" name="password" id="field_password" autocomplete="new_password" required/>
+        </div>
+        <div>
+            <label for="field_password">Retype New Password:</label>
+            <input type="password" name="password" id="field_password" autocomplete="confirm_password" required/>
+        </div>
+        <button type="submit">Change Password</button>
+    </form>
+</main>
+</body>
+</html>
diff --git a/pages/edit-username.go.html b/pages/edit-username.go.html
deleted file mode 100644
index e69de29..0000000
diff --git a/pages/index.go.html b/pages/index.go.html
index 737a71e..7852e1b 100644
--- a/pages/index.go.html
+++ b/pages/index.go.html
@@ -14,11 +14,6 @@
             <button type="submit">Edit Profile</button>
         </form>
     </div>
-    <div>
-        <form method="GET" action="/edit/username">
-            <button type="submit">Change Username</button>
-        </form>
-    </div>
     <div>
         <form method="GET" action="/edit/password">
             <button type="submit">Change Password</button>
@@ -34,14 +29,23 @@
             <button type="submit">Manage Users</button>
         </form>
     </div>
-    <div>
-        <form method="POST" action="/edit/otp">
-            <label><input type="radio" name="digits" value="6"/> 6 digits</label>
-            <label><input type="radio" name="digits" value="7"/> 7 digits</label>
-            <label><input type="radio" name="digits" value="8"/> 8 digits</label>
-            <button type="submit">Change OTP</button>
-        </form>
-    </div>
+    {{if .OtpEnabled}}
+        <div>
+            <form method="POST" action="/edit/otp">
+                <input type="hidden" name="remove" value="1"/>
+                <button type="submit">Remove OTP</button>
+            </form>
+        </div>
+    {{else}}
+        <div>
+            <form method="POST" action="/edit/otp">
+                <label><input type="radio" name="digits" value="6"/> 6 digits</label>
+                <label><input type="radio" name="digits" value="7"/> 7 digits</label>
+                <label><input type="radio" name="digits" value="8"/> 8 digits</label>
+                <button type="submit">Change OTP</button>
+            </form>
+        </div>
+    {{end}}
     <div>
         <form method="POST" action="/logout">
             <input type="hidden" name="nonce" value="{{.Nonce}}">
diff --git a/pages/login-otp.go.html b/pages/login-otp.go.html
index 5cc8d28..799c70e 100644
--- a/pages/login-otp.go.html
+++ b/pages/login-otp.go.html
@@ -12,7 +12,7 @@
         <input type="hidden" name="redirect" value="{{.Redirect}}"/>
         <div>
             <label for="field_code">OTP Code:</label>
-            <input type="text" name="code" id="field_code" required pattern="[0-9]{6,8}" title="6/7/8 digit one time passcode" autocomplete="off" aria-autocomplete="none" role="presentation"/>
+            <input type="text" name="code" id="field_code" required pattern="[0-9]{6,8}" title="6/7/8 digit one time passcode" autocomplete="off" autofocus aria-autocomplete="none" role="presentation"/>
         </div>
         <button type="submit">Login</button>
     </form>
diff --git a/pages/verification-code.go.html b/pages/verification-code.go.html
deleted file mode 100644
index c8ca642..0000000
--- a/pages/verification-code.go.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>{{.Title}}</title>
-    <style>
-        #app > h1 {
-            text-decoration: underline;
-        }
-
-        @media screen and (prefers-color-scheme: dark) {
-            :root {
-                color: #d2d2d2;
-                background-color: #1c1b22;
-            }
-        }
-    </style>
-</head>
-<body>
-<div id="app">
-    <h1>{{.Title}}</h1>
-    <p>Hi {{.Name}},</p>
-    <p>Here is your email verification code: <span>{{.Code}}</span></p>
-    <p>{{.ServiceName}}</p>
-</div>
-</body>
-</html>
diff --git a/server/home.go b/server/home.go
index 7ff3be5..362eeee 100644
--- a/server/home.go
+++ b/server/home.go
@@ -27,11 +27,16 @@ func (h *HttpServer) Home(rw http.ResponseWriter, req *http.Request, _ httproute
 	}
 
 	var userWithName *database.User
+	var hasTwoFactor bool
 	if h.DbTx(rw, func(tx *database.Tx) (err error) {
 		userWithName, err = tx.GetUserDisplayName(auth.Data.ID)
 		if err != nil {
 			return fmt.Errorf("failed to get user display name: %w", err)
 		}
+		hasTwoFactor, err = tx.HasTwoFactor(auth.Data.ID)
+		if err != nil {
+			return fmt.Errorf("failed to get user two factor state: %w", err)
+		}
 		return
 	}) {
 		return
@@ -41,5 +46,6 @@ func (h *HttpServer) Home(rw http.ResponseWriter, req *http.Request, _ httproute
 		"Auth":        auth,
 		"User":        userWithName,
 		"Nonce":       lNonce,
+		"OtpEnabled":  hasTwoFactor,
 	})
 }
