diff --git a/include/i18n/en_US/help/tips/settings.system.yaml b/include/i18n/en_US/help/tips/settings.system.yaml
index ceb6147f8f14f4d71702c8bce5211ab235cf27bb..1d08d55b0d9f77bd2ee8122a971e5fcd3e7ca1b8 100644
--- a/include/i18n/en_US/help/tips/settings.system.yaml
+++ b/include/i18n/en_US/help/tips/settings.system.yaml
@@ -65,15 +65,16 @@ name_format:
     title: Default Name Format
     content: >
         Formatting technique used to format names throughout the system.
-        Email templates will use the format for names of no other format is
+        Email templates will use the format for names if no other format is
         specified in the place holder.
 
 # Authentication settings
 password_reset:
     title: Password Expiration Policy
     content: >
-        Sets the requirement for how often (in months) staff will be
-        required to reset their password.
+        Sets how often (in months) staff members will be required to change
+        their password. If disabled (set to "No expiration"), passwords will
+        not expire.
 
 # Date and time options
 date_and_time:
diff --git a/include/staff/settings-system.inc.php b/include/staff/settings-system.inc.php
index 077a9130ec3b72fa5c713d74fa613edf27f6d66a..3ffd9b5af9cf7474c398b5b6bb6a22631afcdfcd 100644
--- a/include/staff/settings-system.inc.php
+++ b/include/staff/settings-system.inc.php
@@ -123,10 +123,10 @@ $gmtime = Misc::gmtime();
                 <em><b>Authentication Settings</b></em>
             </th>
         </tr>
-        <tr><td>Password Change Policy:</th>
+        <tr><td>Password Expiration Policy:</th>
             <td>
                 <select name="passwd_reset_period">
-                   <option value="0"> &mdash; None &mdash;</option>
+                   <option value="0"> &mdash; No expiration &mdash;</option>
                   <?php
                     for ($i = 1; $i <= 12; $i++) {
                         echo sprintf('<option value="%d" %s>%s%s</option>',