diff --git a/documentation/asciidoc/computers/configuration/headless.adoc b/documentation/asciidoc/computers/configuration/headless.adoc
index 44a6572a5..9c584a25f 100644
--- a/documentation/asciidoc/computers/configuration/headless.adoc
+++ b/documentation/asciidoc/computers/configuration/headless.adoc
@@ -57,6 +57,7 @@ NOTE: Some older Raspberry Pi boards and some USB wireless dongles do not suppor
 
 NOTE: With no keyboard or monitor, you will need some way of xref:remote-access.adoc[remotely accessing] your headless Raspberry Pi. For headless setup, SSH can be enabled by placing a file named `ssh`, without any extension, onto the boot folder of the SD Card. For more information see the section on xref:remote-access.adoc#ssh[setting up an SSH server].
 
+[[configuring-a-user]]
 === Configuring a User
 
 You will need to add a `userconf.txt` in the boot partition of the SD card; this is the part of the SD card which can be seen when it is mounted in a Windows or MacOS computer.
diff --git a/documentation/asciidoc/computers/remote-access/secure-shell.adoc b/documentation/asciidoc/computers/remote-access/secure-shell.adoc
index fd17631a5..d84c8217f 100644
--- a/documentation/asciidoc/computers/remote-access/secure-shell.adoc
+++ b/documentation/asciidoc/computers/remote-access/secure-shell.adoc
@@ -31,4 +31,6 @@ Alternatively you can enable it from the terminal using the xref:configuration.a
 
 NOTE: For headless setup, SSH can be enabled by placing a file named `ssh`, without any extension, onto the boot partition of the SD Card. When the Raspberry Pi boots, it looks for the `ssh` file. If it is found, SSH is enabled and the file is deleted. The content of the file does not matter; it could contain text, or nothing at all.
 
+NOTE: For headless setup in addition to the `ssh`-file you need a `userconfig`-file, which contains a string `username:encryptedpassword`. Please refer to the section on xref:configuration.adoc#configuring-a-user[configuring a user] in the discussions around headless setup of a Raspberry Pi.
+
 WARNING: When enabling SSH on a Raspberry Pi that may be connected to the internet, you should ensure that your password is not easily brute forced.