diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6cd1fa2d7..f0c68296b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@
 - Fix OIDC registration issues [#960](https://github.com/juanfont/headscale/pull/960) and [#971](https://github.com/juanfont/headscale/pull/971)
 - Add support for specifying NextDNS DNS-over-HTTPS resolver [#940](https://github.com/juanfont/headscale/pull/940)
 - Make more sslmode available for postgresql connection [#927](https://github.com/juanfont/headscale/pull/927)
+- Update platform docs with Fast User Switching [#1016](https://github.com/juanfont/headscale/pull/1016)
 
 ## 0.16.4 (2022-08-21)
 
diff --git a/templates/apple.html b/templates/apple.html
index 3c073b967c..d80e6504f6 100644
--- a/templates/apple.html
+++ b/templates/apple.html
@@ -9,7 +9,16 @@
 
   <body>
     <h1>headscale</h1>
-    <h2>Apple configuration profiles</h2>
+    <h2>Recent Tailscale versions (1.34.0 and higher)</h2>
+    <p>
+      Tailscale added Fast User Switching in version 1.34 and you can now use
+      the new login command to connect to one or more headscale (and Tailscale)
+      servers. The previously used profiles does not have an effect anymore.
+    </p>
+    <p>Use Tailscale's login command to add your profile:</p>
+    <pre><code>tailscale login --login-server {{.URL}}</code></pre>
+
+    <h2>Apple configuration profiles (1.32.0 and lower)</h2>
     <p>
       This page provides
       <a href="https://support.apple.com/guide/mdm/mdm-overview-mdmbf9e668/web">
diff --git a/templates/windows.html b/templates/windows.html
index 5e13a72c61..0cd3e5c3e8 100644
--- a/templates/windows.html
+++ b/templates/windows.html
@@ -9,7 +9,16 @@
 
   <body>
     <h1>headscale</h1>
-    <h2>Windows registry configuration</h2>
+    <h2>Recent Tailscale versions (1.34.0 and higher)</h2>
+    <p>
+      Tailscale added Fast User Switching in version 1.34 and you can now use
+      the new login command to connect to one or more headscale (and Tailscale)
+      servers. The previously used profiles does not have an effect anymore.
+    </p>
+    <p>Use Tailscale's login command to add your profile:</p>
+    <pre><code>tailscale login --login-server {{.URL}}</code></pre>
+
+    <h2>Windows registry configuration (1.32.0 and lower)</h2>
     <p>
       This page provides Windows registry information for the official Windows
       Tailscale client.
@@ -55,8 +64,9 @@ <h2>Installation</h2>
       commands to add the required registry entries:
     </p>
     <pre>
-<code>REG ADD "HKLM\Software\Tailscale IPN" /v UnattendedMode /t REG_SZ /d always
-REG ADD "HKLM\Software\Tailscale IPN" /v LoginURL /t REG_SZ /d "{{.URL}}"</code></pre>
+    <code>REG ADD "HKLM\Software\Tailscale IPN" /v UnattendedMode /t REG_SZ /d always
+      REG ADD "HKLM\Software\Tailscale IPN" /v LoginURL /t REG_SZ /d "{{.URL}}"</code>
+  </pre>
     <p>Restart Tailscale and log in.</p>
 
     <p></p>
