diff --git a/apps/browser/src/autofill/popup/settings/autofill.component.ts b/apps/browser/src/autofill/popup/settings/autofill.component.ts
index e1a5a2fc218..8c5c8e600a0 100644
--- a/apps/browser/src/autofill/popup/settings/autofill.component.ts
+++ b/apps/browser/src/autofill/popup/settings/autofill.component.ts
@@ -334,11 +334,24 @@ export class AutofillComponent implements OnInit {
     return null;
   }
 
+  get browserClientVendorExtended() {
+    if (this.browserClientVendor !== BrowserClientVendors.Unknown) {
+      return this.browserClientVendor;
+    }
+    if (this.platformUtilsService.isFirefox()) {
+      return "Firefox";
+    }
+    if (this.platformUtilsService.isSafari()) {
+      return "Safari";
+    }
+    return BrowserClientVendors.Unknown;
+  }
+
   get spotlightButtonText() {
-    if (this.browserClientVendor === BrowserClientVendors.Unknown) {
+    if (this.browserClientVendorExtended === BrowserClientVendors.Unknown) {
       return this.i18nService.t("turnOffAutofill");
     }
-    return this.i18nService.t("turnOffBrowserAutofill", this.browserClientVendor);
+    return this.i18nService.t("turnOffBrowserAutofill", this.browserClientVendorExtended);
   }
 
   async dismissSpotlight() {