diff --git a/ui/src/components/auth/LoginForm.svelte b/ui/src/components/auth/LoginForm.svelte
index 120c6f93..978d766e 100644
--- a/ui/src/components/auth/LoginForm.svelte
+++ b/ui/src/components/auth/LoginForm.svelte
@@ -160,6 +160,7 @@
       required
       bind:value="{email}"
       icon="{Mail}"
+      autocomplete="email"
     />
 
     <PasswordInput
@@ -317,9 +318,11 @@
         placeholder="Enter code"
         id="mfaToken"
         name="mfaToken"
-        pattern="[0-9]{6}"
         required
         icon="{Shield}"
+        inputmode="numeric"
+        pattern="[0-9]*"
+        autocomplete="one-time-code"
       />
     </div>
 
diff --git a/ui/src/components/user/UserRegisterForm.svelte b/ui/src/components/user/UserRegisterForm.svelte
index daa8366d..66fc663e 100644
--- a/ui/src/components/user/UserRegisterForm.svelte
+++ b/ui/src/components/user/UserRegisterForm.svelte
@@ -111,6 +111,7 @@
           required
           disabled="{wasInvited}"
           icon="{Mail}"
+          autocomplete="email"
         />
       </div>