diff --git a/src/components/Login.vue b/src/components/Login.vue
index 1f8946f17..68befd415 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -16,7 +16,7 @@
 
                 <div v-if="tokenRequired">
                     <div class="form-floating mt-3">
-                        <input id="otp" v-model="token" type="text" maxlength="6" class="form-control" placeholder="123456" autocomplete="one-time-code" required>
+                        <input id="otp" ref="otpInput" v-model="token" type="text" maxlength="6" class="form-control" placeholder="123456" autocomplete="one-time-code" required>
                         <label for="otp">{{ $t("Token") }}</label>
                     </div>
                 </div>
@@ -55,6 +55,16 @@ export default {
         };
     },
 
+    watch: {
+        tokenRequired(newVal) {
+            if (newVal) {
+                this.$nextTick(() => {
+                    this.$refs.otpInput?.focus();
+                });
+            }
+        }
+    },
+
     mounted() {
         document.title += " - Login";
     },