diff --git a/docs/client-thunderbird.md b/docs/client-thunderbird.md
index 819f3b46d..a15d65c17 100644
--- a/docs/client-thunderbird.md
+++ b/docs/client-thunderbird.md
@@ -24,7 +24,7 @@
   Close the account settings window with the <i>OK</i> button.
 </li>
 <li class="client_integrator_enabled">
-  In your web browser, download <a class="client_var_integrator_link" href="/thunderbird-plugins/sogo-integrator-__VERSION__-__DOMAIN__.xpi">SOGo Integrator</a>.
+  In your web browser, download <span class="client_variables_unavailable">SOGo Integrator</span><span class="client_variables_available"><a class="client_var_integrator_link" href="/thunderbird-plugins/sogo-integrator-__VERSION__-__DOMAIN__.xpi">SOGo Integrator</a></span>.
 </li>
 <li class="client_integrator_enabled">
   Back in Thunderbird, go to the <i>Tools</i> menu and select <i>Add-ons</i>.
diff --git a/docs/clients.js b/docs/clients.js
index 14edc587e..149ef2795 100644
--- a/docs/clients.js
+++ b/docs/clients.js
@@ -1,5 +1,5 @@
 if (window.location.href.indexOf('/client/') >= 0) {
-    window.onload = function () {
+    window.window.addEventListener('load', function () {
         function getParameterByName(name) {
             var match = RegExp('[?#&]' + name + '=([^&]*)').exec(window.location.hash);
             return match && decodeURIComponent(match[1].replace(/\+/g, ' '));
@@ -26,11 +26,11 @@ if (window.location.href.indexOf('/client/') >= 0) {
         if (getParameterByName('outlookEAS')) {
             document.cookie = "outlookEAS=" + getParameterByName('outlookEAS') + "; path=/";
         }
-    }
+    });
 }
 
 if (window.location.href.indexOf('/client') >= 0) {
-    window.onload = function () {
+    window.window.addEventListener('load', function () {
         function getCookie(cn) {
             var cs = document.cookie.split(';');
             for (var i = 0; i < cs.length; i++) {
@@ -108,5 +108,5 @@ if (window.location.href.indexOf('/client') >= 0) {
                 el.style.display = 'none';
             });
         }
-    }
+    });
 }