diff --git a/src/modules/users/users.conf b/src/modules/users/users.conf
index 0942e6b5d..2e164cf13 100644
--- a/src/modules/users/users.conf
+++ b/src/modules/users/users.conf
@@ -27,26 +27,34 @@ defaultGroups:
 # the desktop environment on boot.
 # Disable when your Distribution does not require such a group.
 autologinGroup:  autologin
-# You can control the initial state for the 'autologin checkbox' in UsersViewStep here.
-# Possible values are: true to enable or false to disable the checkbox by default.
+# You can control the initial state for the 'autologin checkbox' here.
+# Possible values are: 
+#  - true to check or 
+#  - false to uncheck
+# These set the **initial** state of the checkbox.
 doAutologin:     true
 
-# When set to a non-empty string, Calamares creates a sudoers file for the user.
-#  /etc/sudoers.d/10-installer
-# Remember to add sudoersGroup to defaultGroups.
+# When *sudoersGroup* is set to a non-empty string, Calamares creates a 
+# sudoers file for the user. This file is located at:
+#     `/etc/sudoers.d/10-installer`
+# Remember to add the (value of) *sudoersGroup* to *defaultGroups*.
 #
 # If your Distribution already sets up a group of sudoers in its packaging,
 # remove this setting (delete or comment out the line below). Otherwise,
-# the setting will be duplicated in the /etc/sudoers.d/10-installer file,
+# the setting will be duplicated in the `/etc/sudoers.d/10-installer` file,
 # potentially confusing users.
 sudoersGroup:    wheel
 
 # Setting this to false , causes the root account to be disabled.
 setRootPassword: true
-# You can control the initial state for the 'root password checkbox' in UsersViewStep here.
-# Possible values are: true to enable or false to disable the checkbox by default.
-# When enabled the user password is used for the root account too.
-# NOTE: doReusePassword requires setRootPassword to be enabled.
+# You can control the initial state for the 'reuse password for root'
+# checkbox here. Possible values are: 
+#  - true to check or 
+#  - false to uncheck
+#
+# When checked, the user password is used for the root account too.
+#
+# NOTE: *doReusePassword* requires *setRootPassword* to be enabled.
 doReusePassword: true
 
 # These are optional password-requirements that a distro can enforce
@@ -69,21 +77,31 @@ doReusePassword: true
 # (additional checks may be implemented in CheckPWQuality.cpp and
 # wired into UsersPage.cpp)
 #
-# To disable specific password validations,
-# comment out the relevant 'passwordRequirements' keys below.
-# To disable all password validations,
-# set both 'allowWeakPasswords' and 'doPasswordChecks' to false.
+#  - To disable specific password validations:
+#    comment out the relevant 'passwordRequirements' keys below.
+#  - To disable all password validations:
+#    set both 'allowWeakPasswords' and 'allowWeakPasswordsDefault' to true.
+#    (This will show the box *Allow weak passwords* in the user-
+#    interface, and check it by default).
 passwordRequirements:
     minLength: -1  # Password at least this many characters
     maxLength: -1  # Password at most this many characters
     libpwquality:
         - minlen=0
         - minclass=0
-# You can control the visibility of the 'strong passwords' checkbox in UsersViewStep here.
-# Possible values are: true to show or false to hide the checkbox.
+        
+# You can control the visibility of the 'weak passwords' checkbox here.
+# Possible values are: 
+#  - true to show or 
+#  - false to hide 
+# the checkbox. This checkbox allows the user to choose to disable
+# password-strength-checks.
 allowWeakPasswords: true
-# You can control the initial state for the 'strong passwords' checkbox in UsersViewStep here.
-# Possible values are: true to enable or false to disable the checkbox by default.
+# You can control the initial state for the 'weak passwords' checkbox here.
+# Possible values are: 
+#  - true to check or 
+#  - false to uncheck 
+# the checkbox by default.
 doPasswordChecks: true
 
 # Shell to be used for the regular user of the target system.