diff --git a/apps/web/src/app/accounts/login/login.component.html b/apps/web/src/app/accounts/login/login.component.html
index 9854403548..80c4c1455d 100644
--- a/apps/web/src/app/accounts/login/login.component.html
+++ b/apps/web/src/app/accounts/login/login.component.html
@@ -25,6 +25,7 @@
                 bitInput
                 type="email"
                 formControlName="email"
+                appAutofocus
                 (keyup.enter)="validateEmail()"
               />
             </bit-form-field>
@@ -79,6 +80,7 @@
         bitInput
         type="{{ showPassword ? 'text' : 'password' }}"
         formControlName="masterPassword"
+        appAutofocus
       />
       <button type="button" bitSuffix bitButton (click)="togglePassword()">
         <i
diff --git a/libs/angular/src/components/login.component.ts b/libs/angular/src/components/login.component.ts
index 6d4b6966bb..0b35b827af 100644
--- a/libs/angular/src/components/login.component.ts
+++ b/libs/angular/src/components/login.component.ts
@@ -275,9 +275,4 @@ export class LoginComponent extends CaptchaProtectedComponent implements OnInit
       this.showLoginWithDevice = false;
     }
   }
-
-  protected focusInput() {
-    const email = this.loggedEmail;
-    document.getElementById(email == null || email === "" ? "email" : "masterPassword").focus();
-  }
 }