diff --git a/apps/browser/src/auth/popup/login/extension-login-component.service.ts b/apps/browser/src/auth/popup/login/extension-login-component.service.ts
index c14bb7fcffc..0dc49e6bdad 100644
--- a/apps/browser/src/auth/popup/login/extension-login-component.service.ts
+++ b/apps/browser/src/auth/popup/login/extension-login-component.service.ts
@@ -6,7 +6,7 @@ export class ExtensionLoginComponentService
   extends DefaultLoginComponentService
   implements LoginComponentService
 {
-  getShowPasswordlessFlag(): boolean {
+  isLoginViaAuthRequestSupported(): boolean {
     return flagEnabled("showPasswordless");
   }
 }
diff --git a/apps/web/src/app/auth/core/services/login/web-login-component.service.ts b/apps/web/src/app/auth/core/services/login/web-login-component.service.ts
index 0e8f21577ea..87d3aaac5dc 100644
--- a/apps/web/src/app/auth/core/services/login/web-login-component.service.ts
+++ b/apps/web/src/app/auth/core/services/login/web-login-component.service.ts
@@ -27,7 +27,7 @@ export class WebLoginComponentService
   router = inject(Router);
   routerService = inject(RouterService);
 
-  getShowPasswordlessFlag(): boolean {
+  isLoginViaAuthRequestSupported(): boolean {
     return flagEnabled("showPasswordless");
   }
 
diff --git a/libs/auth/src/angular/login/default-login-component.service.ts b/libs/auth/src/angular/login/default-login-component.service.ts
index 074bf6c0f74..dde205dae20 100644
--- a/libs/auth/src/angular/login/default-login-component.service.ts
+++ b/libs/auth/src/angular/login/default-login-component.service.ts
@@ -27,8 +27,8 @@ export class DefaultLoginComponentService implements LoginComponentService {
     return null;
   }
 
-  getShowPasswordlessFlag(): boolean {
-    return null;
+  isLoginViaAuthRequestSupported(): boolean {
+    return false;
   }
 
   async launchSsoBrowserWindow(
diff --git a/libs/auth/src/angular/login/login-component.service.ts b/libs/auth/src/angular/login/login-component.service.ts
index c9dd3a663b7..55ade0a789c 100644
--- a/libs/auth/src/angular/login/login-component.service.ts
+++ b/libs/auth/src/angular/login/login-component.service.ts
@@ -32,10 +32,9 @@ export abstract class LoginComponentService {
   setPreviousUrl: (route: UrlTree) => void | null;
 
   /**
-   * Gets the status of the `showPasswordless` feature flag.
-   * - Used by: Web, Browser
+   * Indicates whether login with device (auth request) is supported on the given client
    */
-  getShowPasswordlessFlag: () => boolean;
+  isLoginViaAuthRequestSupported: () => boolean;
 
   /**
    * Launches the SSO flow in a new browser window.
diff --git a/libs/auth/src/angular/login/login.component.html b/libs/auth/src/angular/login/login.component.html
index f0150784cb5..23f4558390c 100644
--- a/libs/auth/src/angular/login/login.component.html
+++ b/libs/auth/src/angular/login/login.component.html
@@ -117,7 +117,7 @@
       </button>
 
       <!-- Button to Login with Device -->
-      <ng-container *ngIf="showLoginWithDevice && showPasswordless">
+      <ng-container *ngIf="loginViaAuthRequestSupported && isKnownDevice">
         <div class="tw-text-center">{{ "or" | i18n }}</div>
 
         <button
diff --git a/libs/auth/src/angular/login/login.component.ts b/libs/auth/src/angular/login/login.component.ts
index 595451aa85f..ae01b44df27 100644
--- a/libs/auth/src/angular/login/login.component.ts
+++ b/libs/auth/src/angular/login/login.component.ts
@@ -82,7 +82,7 @@ export class LoginComponent implements OnInit, OnDestroy {
   ClientType = ClientType;
   LoginUiState = LoginUiState;
   registerRoute$ = this.registerRouteService.registerRoute$(); // TODO: remove when email verification flag is removed
-  showLoginWithDevice = false;
+  isKnownDevice = false;
   validatedEmail = false;
 
   formGroup = this.formBuilder.group(
@@ -112,7 +112,7 @@ export class LoginComponent implements OnInit, OnDestroy {
   // Web properties
   enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions;
   policies: Policy[];
-  showPasswordless = false;
+  loginViaAuthRequestSupported = false;
   showResetPasswordAutoEnrollWarning = false;
 
   // Desktop properties
@@ -144,7 +144,7 @@ export class LoginComponent implements OnInit, OnDestroy {
     private extensionLoginService: ExtensionLoginService,
   ) {
     this.clientType = this.platformUtilsService.getClientType();
-    this.showPasswordless = this.loginComponentService.getShowPasswordlessFlag();
+    this.loginViaAuthRequestSupported = this.loginComponentService.isLoginViaAuthRequestSupported();
   }
 
   async ngOnInit(): Promise<void> {
@@ -155,7 +155,7 @@ export class LoginComponent implements OnInit, OnDestroy {
     await this.defaultOnInit();
 
     if (this.clientType === ClientType.Browser) {
-      if (this.showPasswordless) {
+      if (this.loginViaAuthRequestSupported) {
         await this.validateEmail();
       }
     }
@@ -423,12 +423,9 @@ export class LoginComponent implements OnInit, OnDestroy {
   private async getLoginWithDevice(email: string): Promise<void> {
     try {
       const deviceIdentifier = await this.appIdService.getAppId();
-      this.showLoginWithDevice = await this.devicesApiService.getKnownDevice(
-        email,
-        deviceIdentifier,
-      );
+      this.isKnownDevice = await this.devicesApiService.getKnownDevice(email, deviceIdentifier);
     } catch (e) {
-      this.showLoginWithDevice = false;
+      this.isKnownDevice = false;
     }
   }