diff --git a/apps/browser/src/autofill/popup/settings/autofill.component.ts b/apps/browser/src/autofill/popup/settings/autofill.component.ts
index 2d29067cf0f..d3f7e3df40e 100644
--- a/apps/browser/src/autofill/popup/settings/autofill.component.ts
+++ b/apps/browser/src/autofill/popup/settings/autofill.component.ts
@@ -62,6 +62,7 @@ import { BrowserApi } from "../../../platform/browser/browser-api";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component";
+import { BrowserPlatformUtilsService } from "../../../platform/services/platform-utils/browser-platform-utils.service";
 
 @Component({
   templateUrl: "autofill.component.html",
@@ -99,6 +100,7 @@ export class AutofillComponent implements OnInit {
     AutofillOverlayVisibility.OnFieldFocus;
   protected blockBrowserInjectionsByDomainEnabled: boolean = false;
   protected browserClientVendor: BrowserClientVendor = BrowserClientVendors.Unknown;
+  protected deviceType = BrowserPlatformUtilsService.getDevice(window);
   protected disablePasswordManagerURI: DisablePasswordManagerUri =
     DisablePasswordManagerUris.Unknown;
   protected browserShortcutsURI: BrowserShortcutsUri = BrowserShortcutsUris.Unknown;
@@ -156,6 +158,7 @@ export class AutofillComponent implements OnInit {
     private nudgesService: NudgesService,
     private accountService: AccountService,
     private autofillBrowserSettingsService: AutofillBrowserSettingsService,
+    private browserPlatformUtilsService: BrowserPlatformUtilsService,
   ) {
     this.autofillOnPageLoadOptions = [
       { name: this.i18nService.t("autoFillOnPageLoadYes"), value: true },
@@ -333,11 +336,20 @@ export class AutofillComponent implements OnInit {
     return null;
   }
 
-  get spotlightButtonText() {
-    if (this.browserClientVendor === BrowserClientVendors.Unknown) {
-      return this.i18nService.t("turnOffAutofill");
+  get browserClientVendorExtended() {
+    if (this.browserClientVendor !== BrowserClientVendors.Unknown) {
+      return this.browserClientVendor;
     }
-    return this.i18nService.t("turnOffBrowserAutofill", this.browserClientVendor);
+    if (this.browserPlatformUtilsService.isFirefox()) {
+      return "Firefox";
+    }
+    if (this.browserPlatformUtilsService.isSafari()) {
+      return "Safari";
+    }
+  }
+
+  get spotlightButtonText() {
+    return this.i18nService.t("turnOffBrowserAutofill", this.browserClientVendorExtended);
   }
 
   async dismissSpotlight() {