diff --git a/ui/src/views/dashboard/SetupTwoFaAtLogin.vue b/ui/src/views/dashboard/SetupTwoFaAtLogin.vue
index 70f418386189..cf3cee760e76 100644
--- a/ui/src/views/dashboard/SetupTwoFaAtLogin.vue
+++ b/ui/src/views/dashboard/SetupTwoFaAtLogin.vue
@@ -109,8 +109,10 @@
           <a-row :gutter="24">
             <a-col :md="24" :lg="22">
               <a-form-item @finish="submitPin" v-ctrl-enter="submitPin" name="code" ref="code">
-                <a-input-password
+                <a-input
                   v-model:value="form.code"
+                  autocomplete="one-time-code"
+                  inputmode="numeric"
                   placeholder="xxxxxx" />
               </a-form-item>
             </a-col>
diff --git a/ui/src/views/dashboard/VerifyTwoFa.vue b/ui/src/views/dashboard/VerifyTwoFa.vue
index a8018338592f..b2d31c03080a 100644
--- a/ui/src/views/dashboard/VerifyTwoFa.vue
+++ b/ui/src/views/dashboard/VerifyTwoFa.vue
@@ -33,9 +33,11 @@
       @finish="handleSubmit"
       layout="vertical">
       <a-form-item name="code" ref="code" style="text-align: center;">
-        <a-input-password
+        <a-input
           style="width: 500px"
           v-model:value="form.code"
+          autocomplete="one-time-code"
+          inputmode="numeric"
           placeholder="xxxxxx" />
       </a-form-item>
       <br/>
@@ -83,7 +85,7 @@ export default {
       })
     },
     focusInput () {
-      const inputElement = this.$refs.code.$el.querySelector('input[type=password]')
+      const inputElement = this.$refs.code.$el.querySelector('input')
       if (inputElement) {
         inputElement.focus()
       }
diff --git a/ui/src/views/iam/SetupTwoFaAtUserProfile.vue b/ui/src/views/iam/SetupTwoFaAtUserProfile.vue
index 28350a0a8c00..c56fe08d0cb1 100644
--- a/ui/src/views/iam/SetupTwoFaAtUserProfile.vue
+++ b/ui/src/views/iam/SetupTwoFaAtUserProfile.vue
@@ -100,8 +100,10 @@
           <a-row :gutter="12">
             <a-col :md="24" :lg="20">
               <a-form-item @finish="submitPin" v-ctrl-enter="submitPin" name="code" ref="code">
-                <a-input-password
+                <a-input
                   v-model:value="form.code"
+                  autocomplete="one-time-code"
+                  inputmode="numeric"
                   placeholder="xxxxxx" />
               </a-form-item>
             </a-col>