diff --git a/src/app/account-settings/pages/confirm-deactivate-account/confirm-deactivate-account.component.html b/src/app/account-settings/pages/confirm-deactivate-account/confirm-deactivate-account.component.html
index a4bae6835e..6e77d3120a 100644
--- a/src/app/account-settings/pages/confirm-deactivate-account/confirm-deactivate-account.component.html
+++ b/src/app/account-settings/pages/confirm-deactivate-account/confirm-deactivate-account.component.html
@@ -128,8 +128,9 @@
         >
           <input
             id="twoFactorCode"
-            type="text"
+            autocomplete="one-time-code"
             inputmode="numeric"
+            name="totp"
             aria-labelledby="2fa-input-label"
             formControlName="twoFactorCode"
             matInput
diff --git a/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.html b/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.html
index 4f61c5d1a0..f0eac3e4e0 100644
--- a/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.html
+++ b/src/app/cdk/two-factor-authentication-form/two-factor/two-factor-authentication-form.component.html
@@ -2,6 +2,7 @@
   <div class="input-container">
     <mat-label
       class="orc-font-small-print"
+      for="totp"
       i18n="@@ngOrcid.signin.2fa.label"
       [ngClass]="{
         error: isVerificationCodeInvalid
@@ -20,7 +21,11 @@
         formControlName="verificationCode"
         cdkFocusInitial
         appTrim
-        autocomplete="off"
+        autocomplete="one-time-code"
+        id="totp"
+        inputmode="numeric"
+        name="totp"
+        type="text"
       />
     </mat-form-field>
     <ng-container *ngIf="!recoveryCode">
@@ -119,7 +124,10 @@
         #inputRecoveryCode
         formControlName="recoveryCode"
         appTrim
-        autocomplete="off"
+        autocomplete="one-time-code"
+        inputmode="numeric"
+        name="totp"
+        type="text"
       />
     </mat-form-field>
     <ng-container *ngIf="recoveryCode">
diff --git a/src/app/two-factor-setup/components/two-factor-enable/two-factor-enable.component.html b/src/app/two-factor-setup/components/two-factor-enable/two-factor-enable.component.html
index e5903e9929..dca4214891 100644
--- a/src/app/two-factor-setup/components/two-factor-enable/two-factor-enable.component.html
+++ b/src/app/two-factor-setup/components/two-factor-enable/two-factor-enable.component.html
@@ -117,7 +117,11 @@
             #inputVerificationCode
             formControlName="verificationCode"
             appTrim
-            autocomplete="off"
+            autocomplete="one-time-code"
+            id="totp"
+            inputmode="numeric"
+            name="totp"
+            type="text"
             data-cy="verification-code-input"
           />
           <mat-hint align="end"