diff --git a/src/app/sign-in/components/form-sign-in/form-sign-in.component.ts b/src/app/sign-in/components/form-sign-in/form-sign-in.component.ts
index 29a1d5cd73..8afc0387f7 100644
--- a/src/app/sign-in/components/form-sign-in/form-sign-in.component.ts
+++ b/src/app/sign-in/components/form-sign-in/form-sign-in.component.ts
@@ -171,8 +171,10 @@ export class FormSignInComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngAfterViewInit(): void {
-    this.firstInput.nativeElement.focus()
-    this.cd.detectChanges()
+    if (!this.signInUpdatesV1Togglz) {
+      this.firstInput.nativeElement.focus()
+      this.cd.detectChanges()
+    }
   }
 
   onSubmit() {