diff --git a/web/template/2fa.tmpl b/web/template/2fa.tmpl
index d5442c773..ce47ab671 100644
--- a/web/template/2fa.tmpl
+++ b/web/template/2fa.tmpl
@@ -25,18 +25,24 @@
             <p>Hi <b>{{- .user -}}</b>!</p>
             <p>
                 You have enabled two-factor authentication for your account.
-                To continue signing in, please enter a code from your authenticator app.
+                To continue signing in, please enter a 6-digit code from your authenticator app.
             </p>
             <p>
-                If you have lost access to your authenticator app, you can enter one of your backup/recovery
-                codes into the form instead to bypass 2FA. Once you have used a code, it cannot be used again.
+                If you have lost access to your authenticator app, you can enter one of your 32-character backup/recovery
+                codes into the form instead to bypass 2FA. Once you have used a recovery code, it cannot be used again.
             </p>
             <div class="labelinput">
-                <label for="code">Code</label>
+                <label for="code">2FA Code</label>
                 <input
                     name="code"
+                    id="code"
+                    autocomplete="off"
+                    autocorrect="off"
+                    autocapitalize="characters"
                     required
-                    placeholder="Please enter a code from your authenticator app, or a one-time backup/recovery code"
+                    autofocus
+                    pattern="(^\d{6}$|^[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{32}$)"
+                    placeholder="Please enter a 6-digit code from your authenticator app, or a 32-character backup/recovery code"
                 >
             </div>
             <button type="submit" class="btn btn-success">Submit</button>
diff --git a/web/template/sign-in.tmpl b/web/template/sign-in.tmpl
index 6362359cb..e6194f7c3 100644
--- a/web/template/sign-in.tmpl
+++ b/web/template/sign-in.tmpl
@@ -24,11 +24,26 @@
         <form action="/auth/sign_in" method="POST">
             <div class="labelinput">
                 <label for="email">Email</label>
-                <input type="email" name="username" required placeholder="Please enter your email address">
+                <input
+                    type="email"
+                    name="username"
+                    id="username"
+                    autocomplete="username"
+                    required
+                    autofocus
+                    placeholder="Please enter your email address"
+                >
             </div>
             <div class="labelinput">
                 <label for="password">Password</label>
-                <input type="password" name="password" required placeholder="Please enter your password">
+                <input
+                    type="password"
+                    name="password"
+                    id="password"
+                    autocomplete="current-password"
+                    required
+                    placeholder="Please enter your password"
+                >
             </div>
             <button type="submit" class="btn btn-success">Sign in</button>
         </form>