diff --git a/doc/html/quickstart_admin.shtml b/doc/html/quickstart_admin.shtml
index 1549621fd092c1faac6a9fb5ddf22afdba34324d..6b45466871b56cb6afeeb4c322c845f96901528b 100644
--- a/doc/html/quickstart_admin.shtml
+++ b/doc/html/quickstart_admin.shtml
@@ -19,7 +19,8 @@ and <i>--sysconfdir=</i></li>
 header files, etc.</li>
 <li>Build a configuration file using your favorite web browser and
 <i>doc/html/configurator.html</i>.<br>
-NOTE: The <i>SlurmUser</i> must be created as needed prior to starting SLURM.<br>
+NOTE: The <i>SlurmUser</i> must be created as needed prior to starting SLURM
+and must exist on all nodes of the cluster.<br>
 NOTE: The parent directories for SLURM's log files, process ID files,
 state save directories, etc. are not created by SLURM.
 They must be created and made writable by <i>SlurmUser</i> as needed prior to 
@@ -164,6 +165,8 @@ controller moves (to or from backup controller) or is restarted.</p>
 <p>We recommend that you create a Unix user <i>slurm</i> for use by 
 <b>slurmctld</b>. This user name will also be specified using the 
 <b>SlurmUser</b> in the slurm.conf configuration file.
+This user must exist on all nodes of the cluster for authentication 
+of communications.
 Note that files and directories used by <b>slurmctld</b> will need to be 
 readable or writable by the user <b>SlurmUser</b> (the slurm configuration 
 files must be readable; the log file directory and state save directory 
@@ -610,6 +613,6 @@ in the NEWS file.
 
 </pre> <p class="footer"><a href="#top">top</a></p>
 
-<p style="text-align:center;">Last modified 28 April 2008</p>
+<p style="text-align:center;">Last modified 5 June 2008</p>
 
 <!--#include virtual="footer.txt"-->
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index f52b05a5adccb47aa9eb3217faf80471ec9960f4..0cf42c4c1a880bb66c14c8072e113756c93d5a3a 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -1,4 +1,4 @@
-.TH "slurm.conf" "5" "May 2008" "slurm.conf 1.3" "Slurm configuration file"
+.TH "slurm.conf" "5" "June 2008" "slurm.conf 1.3" "Slurm configuration file"
 .SH "NAME"
 slurm.conf \- Slurm configuration file 
 .SH "DESCRIPTION"
@@ -849,6 +849,8 @@ NOTE: This implies \fIShared=YES\fR or \fIShared=FORCE\fR for all partitions.
 \fBSlurmUser\fR
 The name of the user that the \fBslurmctld\fR daemon executes as. 
 For security purposes, a user other than "root" is recommended.
+This user must exist on all nodes of the cluster for authentication 
+of communications between SLURM components.
 The default value is "root". 
 
 .TP