diff --git a/keepassxc-browser/_locales/en/messages.json b/keepassxc-browser/_locales/en/messages.json
index 4a47f0b2..edd9a8e1 100644
--- a/keepassxc-browser/_locales/en/messages.json
+++ b/keepassxc-browser/_locales/en/messages.json
@@ -52,16 +52,16 @@
         "description": "Cannot decrypt message."
     },
     "errorMessageTimeout": {
-        "message": "Timeout or not connected to KeePassXC.",
-        "description": "Timeout or not connected to KeePassXC."
+        "message": "Cannot connect to KeePassXC. Is Browser Integration enabled?",
+        "description": "Cannot connect to KeePassXC. Is Browser Integration enabled?"
     },
     "errorMessageCanceled": {
         "message": "Action canceled or denied.",
         "description": "Action canceled or denied."
     },
     "errorMessageEncrypt": {
-        "message": "Cannot encrypt message or public key not found. Is native messaging or support for your browser enabled in KeePassXC?",
-        "description": "Cannot encrypt message or public key not found. Is native messaging or support for your browser enabled in KeePassXC?"
+        "message": "Message encryption failed. Is KeePassXC open and connected?",
+        "description": "Message encryption failed. Is KeePassXC open and connected?"
     },
     "errorMessageAssociate": {
         "message": "KeePassXC association failed, try again.",
diff --git a/keepassxc-browser/popups/popup.html b/keepassxc-browser/popups/popup.html
index 404a4585..587cf401 100644
--- a/keepassxc-browser/popups/popup.html
+++ b/keepassxc-browser/popups/popup.html
@@ -52,7 +52,7 @@
       </div>
 
       <div id="configured-and-associated" style="display: none">
-        <span data-i18n="popupConfiguredAndAssociated" i18n-placeholder="<span class='bg-success' id='associated-identifier'></span>"></span>
+        <p data-i18n="popupConfiguredAndAssociated" i18n-placeholder="<span class='bg-success' id='associated-identifier'></span>"></p>
         <div style="text-align: right">
           <button id="redetect-fields-button" class="btn btn-sm btn-primary"><span class="glyphicon glyphicon-list-alt"></span> <span data-i18n="popupRedetectButton"/></button>
         </div>