diff --git a/chapter04/addinguser.xml b/chapter04/addinguser.xml
index c82c67557..7903b5a84 100644
--- a/chapter04/addinguser.xml
+++ b/chapter04/addinguser.xml
@@ -68,11 +68,11 @@ useradd -s /bin/bash -g lfs -m -k /dev/null lfs</userinput></screen>
 
   </variablelist>
 
-  <para>To enable logging in as <systemitem class="username">lfs</systemitem> (as opposed
-  to switching to user <systemitem class="username">lfs</systemitem> when logged
-  in as <systemitem class="username">root</systemitem>, which does not require
-  the <systemitem class="username">lfs</systemitem> user to have a password),
-  give <systemitem class="username">lfs</systemitem> a password:</para>
+  <para>If you want to log in as &lfs-user; or switch to &lfs-user; from a
+  non-&root; user (as opposed to switching to user &lfs-user;
+  when logged in as &root;, which does not require the &lfs-user; user to
+  have a password), you need to set a password of &lfs-user;.  Issue the
+  following command as the &root; user to set the password:</para>
 
 <screen role="nodump"><userinput>passwd lfs</userinput></screen>
 
@@ -90,9 +90,9 @@ esac</userinput></screen>
   If the prompt "lfs:~$" does not appear immediately, entering the
   <command>fg</command> command will fix the issue.</para></note>
 
-  <para>Next, login as user <systemitem class="username">lfs</systemitem>.
-  This can be done via a virtual console, through a display manager, or with
-  the following substitute/switch user command:</para>
+  <para>Next, start a shell running as user &lfs-user;. This can be done by
+  logging in as &lfs-user; on a virtual console, or with the following
+  substitute/switch user command:</para>
 
 <screen role="nodump"><userinput>su - lfs</userinput></screen>
 
diff --git a/chapter04/settingenviron.xml b/chapter04/settingenviron.xml
index e40e4a45b..a57246217 100644
--- a/chapter04/settingenviron.xml
+++ b/chapter04/settingenviron.xml
@@ -19,8 +19,10 @@
 <literal>exec env -i HOME=$HOME TERM=$TERM PS1='\u:\w\$ ' /bin/bash</literal>
 EOF</userinput></screen>
 
-  <para>When logged on as user <systemitem class="username">lfs</systemitem>,
-  the initial shell is usually a <emphasis>login</emphasis> shell which reads
+  <para>When logged on as user <systemitem class="username">lfs</systemitem>
+  or switched to the &lfs-user; user using a <command>su</command> command
+  with <quote><parameter>-</parameter></quote> option,
+  the initial shell is a <emphasis>login</emphasis> shell which reads
   the <filename>/etc/profile</filename> of the host (probably containing some
   settings and environment variables) and then <filename>.bash_profile</filename>.
   The <command>exec env -i.../bin/bash</command> command in the