diff --git a/docbook/Admin_Guide/en-US/User_Management.xml b/docbook/Admin_Guide/en-US/User_Management.xml
index a4936ee716..adb637545f 100644
--- a/docbook/Admin_Guide/en-US/User_Management.xml
+++ b/docbook/Admin_Guide/en-US/User_Management.xml
@@ -51,8 +51,8 @@
 	    </listitem>
 	    <listitem>
 	        <para>If email notifications ($g_enable_email_notification) is
-		set to ON, users with access level above
-		$g_notify_new_user_created_threshold_min will get a
+		set to ON, users with access level of
+		$g_notify_new_user_created_threshold_min and above will get a
 		notification that a user account has been created.  Information
 		about the user like user name, email address, IP address are included in
 		the email notification.</para>
@@ -147,8 +147,8 @@
 	(see <xref linkend="admin.config.email" />).
 	</para>
 	<para>If email notifications ($g_enable_email_notification) is
-	set to ON, users with access level above
-	$g_notify_new_user_created_threshold_min will get a
+	set to ON, users with access level of
+	$g_notify_new_user_created_threshold_min and above will get a
 	notification that a user account has been created.  Information
 	about the user like user name, email address, IP address are included in
 	the email notification.</para>
diff --git a/docbook/Admin_Guide/en-US/config/defaults.xml b/docbook/Admin_Guide/en-US/config/defaults.xml
index 380ac9f0a8..5145c28cce 100644
--- a/docbook/Admin_Guide/en-US/config/defaults.xml
+++ b/docbook/Admin_Guide/en-US/config/defaults.xml
@@ -223,7 +223,7 @@
 			</listitem>
 		</varlistentry>
 		<varlistentry>
-			<term>$g_default_email_on_new$g_default_email_on_assigned$g_default_email_on_feedback$g_default_email_on_resolved$g_default_email_on_closed</term>
+			<term>$g_default_email_on_new, $g_default_email_on_assigned, $g_default_email_on_feedback, $g_default_email_on_resolved, $g_default_email_on_closed</term>
 			<listitem>
 				<para>Default user preferences to enable receiving emails when a
 					bug is set to the corresponding status. This option only has an
@@ -249,15 +249,23 @@
 			</listitem>
 		</varlistentry>
 		<varlistentry>
-			<term>$g_default_email_on_status, $g_default_email_on_priority</term>
+			<term>$g_default_email_on_status</term>
 			<listitem>
 				<para>Default user preferences to enable receiving emails when
-					status or priority is changed. Default is OFF.
+					status is changed. Default is OFF.
 				</para>
 			</listitem>
 		</varlistentry>
 		<varlistentry>
-			<term>$g_default_email_on_new_minimum_severity$g_default_email_on_assigned_minimum_severity$g_default_email_on_feedback_minimum_severity$g_default_email_on_resolved_minimum_severity$g_default_email_on_closed_minimum_severity$g_default_email_on_reopened_minimum_severity$g_default_email_on_bugnote_minimum_severity</term>
+			<term>$g_default_email_on_priority</term>
+			<listitem>
+				<para>Default user preferences to enable receiving emails when
+					priority is changed. Default is OFF.
+				</para>
+			</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term>$g_default_email_on_new_minimum_severity, $g_default_email_on_assigned_minimum_severity, $g_default_email_on_feedback_minimum_severity, $g_default_email_on_resolved_minimum_severity, $g_default_email_on_closed_minimum_severity, $g_default_email_on_reopened_minimum_severity, $g_default_email_on_bugnote_minimum_severity</term>
 			<listitem>
 				<para>Default user preferences to enable filtering based on issue
 					severity. These correspond to the email_on_&lt;status&gt; settings.
@@ -275,12 +283,18 @@
 			</listitem>
 		</varlistentry>
 		<varlistentry>
-			<term>$g_default_email_on_status_minimum_severity$g_default_email_on_priority_minimum_severity</term>
+			<term>$g_default_email_on_status_minimum_severity</term>
+			<listitem>
+				<para>Default user preference to enable filtering based on issue
+					severity. These corresponds to the email_on_status settings. Default is 'any'.
+				</para>
+			</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term>$g_default_email_on_priority_minimum_severity</term>
 			<listitem>
 				<para>Default user preferences to enable filtering based on issue
-					severity. These correspond to the email_on_status and
-					email_on_priority settings. Default is 'any'. Note that this option
-					is not yet implemented.
+					severity. These corresponds to the email_on_priority settings. Default is 'any'.
 				</para>
 			</listitem>
 		</varlistentry>