diff --git a/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.html b/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.html
index e807cb7a2be..b516636bf15 100644
--- a/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.html
+++ b/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.html
@@ -11,7 +11,7 @@
         </p>
         <bit-form-field disableMargin formGroupName="userVerification">
           <bit-label>{{ "masterPassword" | i18n }}</bit-label>
-          <input type="password" bitInput formControlName="masterPassword" />
+          <input type="password" bitInput formControlName="masterPassword" appAutofocus />
           <button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
           <bit-hint>{{ "confirmIdentity" | i18n }}</bit-hint>
         </bit-form-field>
@@ -39,7 +39,7 @@
         </p>
         <bit-form-field disableMargin formGroupName="credentialNaming">
           <bit-label>{{ "customName" | i18n }}</bit-label>
-          <input type="text" bitInput formControlName="name" />
+          <input type="text" bitInput formControlName="name" appAutofocus />
           <bit-hint>{{
             "charactersCurrentAndMaximum"
               | i18n : formGroup.value.credentialNaming.name.length : NameMaxCharacters