diff --git a/apps/browser/src/auth/popup/login/extension-login.service.ts b/apps/browser/src/auth/popup/login/extension-login.service.ts
index b93ce72c9d..c9f0594cee 100644
--- a/apps/browser/src/auth/popup/login/extension-login.service.ts
+++ b/apps/browser/src/auth/popup/login/extension-login.service.ts
@@ -1,3 +1,9 @@
 import { DefaultLoginService, LoginService } from "@bitwarden/auth/angular";
 
-export class ExtensionLoginService extends DefaultLoginService implements LoginService {}
+import { flagEnabled } from "../../../platform/flags"; // TODO-rr-bw: do I need a client specific `flagEnabled()` fn?
+
+export class ExtensionLoginService extends DefaultLoginService implements LoginService {
+  getShowPasswordlessFlag(): boolean {
+    return flagEnabled("showPasswordless");
+  }
+}
diff --git a/libs/auth/src/angular/login/login.component.ts b/libs/auth/src/angular/login/login.component.ts
index 75afd81dd4..9f57e3cfca 100644
--- a/libs/auth/src/angular/login/login.component.ts
+++ b/libs/auth/src/angular/login/login.component.ts
@@ -127,6 +127,12 @@ export class LoginComponentV2 implements OnInit, OnDestroy {
       this.showResetPasswordAutoEnrollWarning = orgPolicies?.isPolicyAndAutoEnrollEnabled;
       this.enforcedPasswordPolicyOptions = orgPolicies?.enforcedPasswordPolicyOptions;
     }
+
+    if (this.clientType === ClientType.Browser) {
+      if (this.showPasswordless) {
+        await this.validateEmail();
+      }
+    }
   }
 
   ngOnDestroy(): void {