diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index d9fb9e2f4a..89437f7764 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -3967,16 +3967,26 @@
                         producing your final image.
                         Among other things, leaving this in place sets the
                         root password as blank.
-                    </para></listitem>
+                        </para></listitem>
                     <listitem><para>
-                        It is possible to set a root password or to add
-                        some additional user account for later administrative
-                        or service access using the
+                        It is possible to set a root password for the image.
+                        For information on how to do that, see the
+                        <ulink url='https://wiki.yoctoproject.org/wiki/FAQ:How_do_I_set_or_change_the_root_password'>How do I set or change the root password</ulink>
+                        Wiki page.
+                        </para></listitem>
+                    <listitem><para>
+                        It is possible to add an additional user account
+                        for later administrative or service access using the
                         <ulink url='&YOCTO_DOCS_REF_URL;#ref-classes-extrausers'><filename>extrausers</filename></ulink>
                         class or the
                         <ulink url='&YOCTO_DOCS_REF_URL;#var-ROOTFS_POSTPROCESS_COMMAND'><filename>ROOTFS_POSTPROCESS_COMMAND</filename></ulink>
                         variable.
-                        If you do this, be cautious about setting
+                        For an example on how to add users, see the
+                        "<ulink url='&YOCTO_DOCS_REF_URL;#ref-classes-extrausers'><filename>extrausers.bbclass</filename></ulink>"
+                        section.
+                        </para>
+                        <para>If you do add extra user accounts,
+                        be cautious about setting
                         the same password for every device.
                         If you want the device to remain secure
                         from unauthorized access, and the password set on
@@ -3985,7 +3995,7 @@
                         If you need this access but want to ensure security,
                         consider setting a different, random password for each
                         device.
-                    </para></listitem>
+                        </para></listitem>
                 </itemizedlist>
             </para>
         </section>