diff --git a/docs/_passwd.md b/docs/_passwd.md
index d8dade24..22726ee4 100644
--- a/docs/_passwd.md
+++ b/docs/_passwd.md
@@ -1,10 +1,16 @@
 ??? danger "✮ ✮ ✮ CHANGE THE PASSWORDS! ✮ ✮ ✮"
     PiKVM comes with the following default passwords:
 
-    * **Linux admin** (SSH, console, etc.): user `root`, password `root`.
-    * **PiKVM Web Interface** ([API](api.md), [VNC](vnc.md)...): user `admin`, password `admin`, no 2FA code.
+    * **Linux OS-level admin** (SSH, console...):
+        * Username: `root`
+        * Password: `root`
 
-    **These are two separate entities with independent accounts.**
+    * **KVM user** (Web Interface, [API](api.md), [VNC](vnc.md)...):
+        * Username: `admin`
+        * Password: `admin`
+        * No 2FA code
+
+    **They are two separate accounts with independent passwords.**
 
     To change passwords, you will need to use the console access via SSH or the Web Terminal.
     If you are using the Web Terminal, enter the `su -` command to get the `root` access (enter the `root` user password).
diff --git a/docs/auth.md b/docs/auth.md
index 2b5525b3..2e5f3041 100644
--- a/docs/auth.md
+++ b/docs/auth.md
@@ -11,7 +11,7 @@
         * Password: `admin`
         * No 2FA code
 
-    **They are two separate entities with independent passwords.**
+    **They are two separate accounts with independent passwords.**
 
 !!! danger "Don't forget to change BOTH passwords on the new device"
 
diff --git a/docs/first_steps.md b/docs/first_steps.md
index 8dda8e9b..4763553f 100644
--- a/docs/first_steps.md
+++ b/docs/first_steps.md
@@ -33,6 +33,21 @@ By default, PiKVM receives a dynamic IP address via DHCP. PiKVM V3+ devices show
 For future examples, let's assume that PiKVM has received the address `192.168.0.100`,
 which you have successfully detected using the instructions above. The device has also been assigned a hostname `pikvm`.
 
+!!! warning "PiKVM comes with the following default passwords"
+
+    * **Linux OS-level admin** (SSH, console...):
+        * Username: `root`
+        * Password: `root`
+
+    * **KVM user** (Web Interface, [API](api.md), [VNC](vnc.md)...):
+        * Username: `admin`
+        * Password: `admin`
+        * No 2FA code
+
+    They are two separate accounts with independent passwords.
+
+    **One of the last steps tells you how to change them. Don't forget to do it!**
+
 ??? example "Access to PiKVM Web Interface"
 
     **We recommend using the latest Google Chrome or Chromium**, as they support the largest number of PiKVM features.
@@ -46,7 +61,7 @@ which you have successfully detected using the instructions above. The device ha
     **The default user is `admin`, the password is also `admin`, and no 2FA code.**
 
     After logging in, you will get access to the menu with the main functions.
-    Using the Web Terminal, you can change system settings and passwords.
+    Using the Web Terminal, you can change system settings and passwords as described below.
 
     *The latest versions of Google Chrome on Mac OS do not allow access to the page with a self-signed certificate,
     which is used in PiKVM by default. You can proceed by typing `thisisunsafe` and Chrome will then load the page.*
@@ -79,7 +94,7 @@ which you have successfully detected using the instructions above. The device ha
 !!! tip "Obtaining root access"
 
     * If you have logged in via SSH, then most likely you are already `root`.
-    * To get `root` in the Web Terminal, use command `su -` and enter the root password.
+    * To get `root` in the Web Terminal, use command `su -` and enter the root password. The default `root` password is `root`.*
 
 PiKVM OS (and the underlying Arch Linux ARM upstream) often receives software updates.
 After installation, it makes sense to update the OS.