diff --git a/libs/angular/src/auth/components/login-with-device.component.ts b/libs/angular/src/auth/components/login-with-device.component.ts
index d8569212d25..14b23aa1da9 100644
--- a/libs/angular/src/auth/components/login-with-device.component.ts
+++ b/libs/angular/src/auth/components/login-with-device.component.ts
@@ -67,7 +67,7 @@ export class LoginWithDeviceComponent
 
     const navigation = this.router.getCurrentNavigation();
     if (navigation) {
-      this.email = navigation.extras?.state?.email;
+      this.email = this.loginService.getEmail();
     }
 
     //gets signalR push notification
diff --git a/libs/angular/src/auth/components/login.component.ts b/libs/angular/src/auth/components/login.component.ts
index 3f662d89b9c..17210287778 100644
--- a/libs/angular/src/auth/components/login.component.ts
+++ b/libs/angular/src/auth/components/login.component.ts
@@ -184,8 +184,8 @@ export class LoginComponent extends CaptchaProtectedComponent implements OnInit
       return;
     }
 
-    const email = this.formGroup.get("email").value;
-    this.router.navigate(["/login-with-device"], { state: { email: email } });
+    this.setFormValues();
+    this.router.navigate(["/login-with-device"]);
   }
 
   async launchSsoBrowser(clientId: string, ssoRedirectUri: string) {