diff --git a/src/components/mfa_form/totp_form.vue b/src/components/mfa_form/totp_form.vue
index a344b395..bc38b376 100644
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@@ -16,9 +16,15 @@
             {{ $t('login.authentication_code') }}
           </label>
           <input
-            id="code"
-            v-model="code"
+            autocomplete="one-time-code"
+            autocorrect="off"
+            autocapitalize="off"
             class="form-control"
+            id="totp"
+            name="totp"
+            spellcheck="false"
+            type="text"
+            v-model="code"
           >
         </div>
 
diff --git a/src/components/settings_modal/tabs/security_tab/mfa.vue b/src/components/settings_modal/tabs/security_tab/mfa.vue
index 7aca3c8d..351f9c97 100644
--- a/src/components/settings_modal/tabs/security_tab/mfa.vue
+++ b/src/components/settings_modal/tabs/security_tab/mfa.vue
@@ -97,8 +97,16 @@
                 <h4>{{ $t('general.verify') }}</h4>
                 <p>{{ $t('settings.mfa.verify.desc') }}</p>
                 <input
-                  v-model="otpConfirmToken"
+                  autocomplete="one-time-code"
+                  autocorrect="off"
+                  autocapitalize="off"
+                  id="totp"
+                  maxlength="6"
+                  name="totp"
+                  pattern="[0-9]*"
+                  spellcheck="false"
                   type="text"
+                  v-model="otpConfirmToken"
                 >
 
                 <p>{{ $t('settings.enter_current_password_to_confirm') }}:</p>