diff --git a/docs/client-apple.md b/docs/client-apple.md
index cd2b7c2a9..ff559249e 100644
--- a/docs/client-apple.md
+++ b/docs/client-apple.md
@@ -1,8 +1,10 @@
-1. Download and open <a class="client_var_link" href="mobileconfig.php">Mailcow.mobileconfig</a>.
+Email, contacts and calendar can be configured automatically on Apple devices by installing a profile. It configure IMAP, CardDAV and CalDAV.
+
+1. Download and open <span class="client_variables_unavailable">the file from <i>https://${MAILCOW_HOSTNAME}/mobileconfig.php</i></span><span class="client_variables_available"><a class="client_var_link" href="mobileconfig.php">Mailcow.mobileconfig</a></span>.
 2. Enter the unlock code (iPhone) or computer password (Mac).
 3. Enter your email password three times when prompted.
 
-On iOS, Exchange is also supported as an alternative to the procedure above. It has the advantage of supporting push email (i.e. you are immediately notified of incoming messages), but has some limitations, e.g. it does not support more than three email addresses per contact in your address book. Follow the steps below if you decide to use Exchange instead.
+On iOS, Exchange ActiveSync is also supported as an alternative to the procedure above. It has the advantage of supporting push email (i.e. you are immediately notified of incoming messages), but has some limitations, e.g. it does not support more than three email addresses per contact in your address book. Follow the steps below if you decide to use Exchange instead.
 
 1. Open the *Settings* app, tap *Mail*, tap *Accounts*, tap *Add Acccount*, select *Exchange*.
 2. Enter your email address<span class="client_variables_available"> (<code><span class="client_var_email"></span></code>)</span> and tap *Next*.
diff --git a/docs/client-windows.md b/docs/client-windows.md
index 9c917c81e..f47c6001f 100644
--- a/docs/client-windows.md
+++ b/docs/client-windows.md
@@ -1,3 +1,5 @@
+Windows 8 and higher support email, contacts and calendar via Exchange ActiveSync.
+
 1. Open the *Mail* app.
 2. If you have not previously used Mail, you can click *Add Account* in the main window. Proceed to step 4.
 3. Click *Accounts* in the sidebar on the left, then click *Add Account* on the far right.
diff --git a/docs/client.md b/docs/client.md
index 448232dd8..061a2d392 100644
--- a/docs/client.md
+++ b/docs/client.md
@@ -1,11 +1,18 @@
 Mailcow supports a variety of email clients, both on desktop computers and on smartphones.
 Below, you can find a number of configuration guides that explain how to configure your Mailcow account.
 
+<div class="client_variables_unavailable" markdown="1">
+If you access this page by logging into your Mailcow server and clicking the "Show configuration guides for email clients and smartphones" link, all of the guides will be personalized with your email address and server name.
+</div>
+<div class="client_variables_available" markdown="1">
+Since you accessed this page after logging into your Mailcow server, all of the guides have been personalized with your email address and server name.
+</div>
+
 - [Android](client-android)
 - [Apple iOS / macOS](client-apple)
 - [eM Client](client-emclient)
 - [KDE Kontact / KMail](client-kontact)
 - [Microsoft Outlook](client-outlook)
 - [Mozilla Thunderbird](client-thunderbird)
-- [Windows](client-windows)
+- [Windows Mail](client-windows)
 - [Windows Phone](client-windowsphone)
diff --git a/docs/clients.js b/docs/clients.js
index 97db86e50..14edc587e 100644
--- a/docs/clients.js
+++ b/docs/clients.js
@@ -29,7 +29,7 @@ if (window.location.href.indexOf('/client/') >= 0) {
     }
 }
 
-if (window.location.href.indexOf('/client-') >= 0) {
+if (window.location.href.indexOf('/client') >= 0) {
     window.onload = function () {
         function getCookie(cn) {
             var cs = document.cookie.split(';');
diff --git a/mkdocs.yml b/mkdocs.yml
index 980828c49..62463b506 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -77,7 +77,7 @@ pages:
   - 'KDE Kontact': 'client-kontact.md'
   - 'Microsoft Outlook': 'client-outlook.md'
   - 'Mozilla Thunderbird': 'client-thunderbird.md'
-  - 'Windows': 'client-windows.md'
+  - 'Windows Mail': 'client-windows.md'
   - 'Windows Phone': 'client-windowsphone.md'
 - 'Third party apps':
   - 'Roundcube': 'third_party-roundcube.md'