diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index 5caa3f8a1e3..6db3756a468 100644
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -1391,16 +1391,23 @@
       (RFC 6409/STD 72; sending mail via port 25 is DEPRECATED.)"/>
       <configstring name="localhost" required="false" desc="The local hostname
       / domain [localhost]"/>
-      <configenum name="auth" desc="Authenticate to SMTP server?">false
-       <values>
-        <value desc="No">false</value>
-        <value desc="Yes">true</value>
-       </values>
-      </configenum>
-      <configstring name="username" required="false" desc="The username to use
-      for SMTP auth. If empty, uses the Horde authentication username."/>
-      <configstring name="password" required="false" desc="The password to use
-      for SMTP auth. If empty, uses the Horde authentication password."/>
+      <configswitch name="auth" desc="Authenticate to SMTP server?">false
+       <case name="false" desc="No" />
+       <case name="true" desc="Yes">
+        <configstring name="username" required="false" desc="The master
+        username to use for SMTP auth. Will be used if username_auth is false
+        OR for unauthenticated Horde accesses."/>
+        <configboolean name="username_auth" required="false" desc="If
+        authenticated, use the Horde authentication
+        username?">true</configboolean>
+        <configstring name="password" required="false" desc="The master
+        password to use for SMTP auth. Will be used if password_auth is false
+        OR for unauthenticated Horde accesses."/>
+        <configboolean name="password_auth" required="false" desc="If
+        authenticated, use the Horde authentication
+        password?">true</configboolean>
+       </case>
+      </configswitch>
       <configboolean name="lmtp" required="false" desc="Is this an LMTP
       (Local Mail Transfer Protocol) server?">false</configboolean>
      </configsection>
diff --git a/horde/docs/CHANGES b/horde/docs/CHANGES
index 3768325aabc..a07a028ff3a 100644
--- a/horde/docs/CHANGES
+++ b/horde/docs/CHANGES
@@ -1,3 +1,11 @@
+---------
+v5.2.0RC3
+---------
+
+[mms] Add configuration to allow for SMTP authentication if the current Horde
+      access does not have an authenticated user.
+
+
 ---------
 v5.2.0RC2
 ---------
diff --git a/horde/docs/UPGRADING b/horde/docs/UPGRADING
index f302a7dd2e6..46861d4f7ce 100644
--- a/horde/docs/UPGRADING
+++ b/horde/docs/UPGRADING
@@ -81,10 +81,14 @@ The following options were added::
     $conf['cachecssparams']['filemtime']
     $conf['history']['driver']
     $conf['history']['params']['driverconfig']
+    $conf['mailer']['params']['password_auth']
+    $conf['mailer']['params']['username_auth']
 
 The available options for the following options were changed::
 
     $conf['activesync']['logging']['type']
+    $conf['mailer']['params']['password'] (for SMTP)
+    $conf['mailer']['params']['username'] (for SMTP)
 
 The default value for the following options were changed::
 
diff --git a/horde/package.xml b/horde/package.xml
index 705bfaed837..0c4f51693e5 100644
--- a/horde/package.xml
+++ b/horde/package.xml
@@ -39,7 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
  <notes>
-* 
+* [mms] Add configuration to allow for SMTP authentication if the current Horde access does not have an authenticated user.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -3932,7 +3932,7 @@
    <date>2014-07-01</date>
    <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
    <notes>
-* 
+* [mms] Add configuration to allow for SMTP authentication if the current Horde access does not have an authenticated user.
    </notes>
   </release>
  </changelog>