diff --git a/web-extension/_locales/de/messages.json b/web-extension/_locales/de/messages.json
index fb8e72c..b3fd5a5 100644
--- a/web-extension/_locales/de/messages.json
+++ b/web-extension/_locales/de/messages.json
@@ -177,7 +177,7 @@
     "description": "Error when another basic authentication popup is already open"
   },
   "correctlySetup": {
-    "message": "Ist Gopass für Gopass Bridge eingerichtet? Bei Aktualisierung auf Gopass v1.10 oder neuer muss das gopass-jsonapi Setup erneut ausgeführt werden.",
+    "message": "Die Gopass Integration für diesen Browser ist wahrscheinlich nicht installiert. Bitte `gopass-jsonapi configure` ausführen.",
     "description": "Error when gopassbridge is not correctly setup"
   }
 }
diff --git a/web-extension/_locales/en/messages.json b/web-extension/_locales/en/messages.json
index c5e0c8c..9a86569 100644
--- a/web-extension/_locales/en/messages.json
+++ b/web-extension/_locales/en/messages.json
@@ -177,7 +177,7 @@
     "description": "Error when another basic authentication popup is already open"
   },
   "correctlySetup": {
-    "message": "Is your browser correctly set up for gopass? If you are upgrading to gopass v1.10 or newer you need to re-run the gopass-jsonapi setup command.",
+    "message": "Your browser's integration with gopass is probably not set up. Please run `gopass-jsonapi configure`.",
     "description": "Error when gopassbridge is not correctly setup"
   }
 }
diff --git a/web-extension/popup.js b/web-extension/popup.js
index e750c05..3bec4ab 100644
--- a/web-extension/popup.js
+++ b/web-extension/popup.js
@@ -3,13 +3,14 @@
 let spinnerTimeout;
 const SETUP_URL = 'https://github.com/gopasspw/gopass/blob/master/docs/setup.md#filling-in-passwords-from-browser';
 const SETUP_ERRORS = [
-    'Access to the specified native messaging host is forbidden',
+    'Access to the specified native messaging host is forbidden', // Chrome: extension ID not in allowed_origins
     'Attempt to postMessage on disconnected port',
     'Specified native messaging host not found',
     'Native host has exited', // Chrome: gopass-jsonapi not found or other error in gopass_wrapper.sh
     'Error when communicating with the native messaging host', // Chrome: gopass v1.10 returns invalid message
     'An unexpected error occurred', // Firefox: gopass-jsonapi not found or other error in gopass_wrapper.sh
     'Native application tried to send a message', // Firefox: gopass v1.10 returns invalid message
+    'No such native application', // Firefox: gopass-jsonapi not configured
 ];
 
 function armSpinnerTimeout() {