diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 29946086d..41c752872 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -50,6 +50,7 @@ class PreferenceController extends Zend_Controller_Action
                     Application_Model_Preference::SetMailServerEmailAddress($values["preferences_email_server"]["email"]);
                     Application_Model_Preference::SetMailServerPassword($values["preferences_email_server"]["ms_password"]);
                     Application_Model_Preference::SetMailServerPort($values["preferences_email_server"]["port"]);
+                    Application_Model_Preference::SetMailServerRequiresAuth($values["preferences_email_server"]["msRequiresAuth"]);
                 }
 
                 Application_Model_Preference::SetAutoUploadRecordedShowToSoundcloud($values["preferences_soundcloud"]["UseSoundCloud"]);
diff --git a/airtime_mvc/application/forms/EmailServerPreferences.php b/airtime_mvc/application/forms/EmailServerPreferences.php
index 419a35a07..ef24ba0e7 100644
--- a/airtime_mvc/application/forms/EmailServerPreferences.php
+++ b/airtime_mvc/application/forms/EmailServerPreferences.php
@@ -41,6 +41,15 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
                 'viewHelper'
             )
         ));
+        
+        $this->addElement('checkbox', 'msRequiresAuth', array(
+            'label' => 'Requires Authentication',
+            'required' => false,
+            'value' => Application_Model_Preference::GetMailServerRequiresAuth(),
+            'decorators' => array(
+            	'viewHelper'
+            )
+        ));
 
         $this->addElement('text', 'mailServer', array(
             'class' => 'input_text',
@@ -50,7 +59,9 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
             'decorators' => array('viewHelper'),
             'allowEmpty' => false,
             'validators' => array(
-                new ConditionalNotEmpty(array('configureMailServer'=>'1'))
+                new ConditionalNotEmpty(array(
+                	'configureMailServer' => '1'
+                ))
             )
         ));
 
@@ -62,7 +73,10 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
             'decorators' => array('viewHelper'),
             'allowEmpty' => false,
             'validators' => array(
-                new ConditionalNotEmpty(array('configureMailServer'=>'1'))
+                new ConditionalNotEmpty(array(
+                	'configureMailServer' => '1',
+                    'msRequiresAuth' => '1'
+                ))
             )
         ));
 
@@ -74,7 +88,10 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
             'decorators' => array('viewHelper'),
             'allowEmpty' => false,
             'validators' => array(
-                new ConditionalNotEmpty(array('configureMailServer'=>'1'))
+                new ConditionalNotEmpty(array(
+                	'configureMailServer' => '1',
+                	'msRequiresAuth' => '1'
+                ))
             ),
             'renderPassword' => true
         ));
diff --git a/airtime_mvc/application/models/Email.php b/airtime_mvc/application/models/Email.php
index a809045c9..79455002d 100644
--- a/airtime_mvc/application/models/Email.php
+++ b/airtime_mvc/application/models/Email.php
@@ -13,23 +13,31 @@ class Application_Model_Email
     public static function send($subject, $message, $tos, $from = null)
     {
         $mailServerConfigured = Application_Model_Preference::GetMailServerConfigured() == true ? true : false;
+        $mailServerRequiresAuth = Application_Model_Preference::GetMailServerRequiresAuth() == true ? true : false;
         $success = true;
 
         if ($mailServerConfigured) {
-            $username = Application_Model_Preference::GetMailServerEmailAddress();
-            $password = Application_Model_Preference::GetMailServerPassword();
             $mailServer = Application_Model_Preference::GetMailServer();
             $mailServerPort = Application_Model_Preference::GetMailServerPort();
             if (!empty($mailServerPort)) {
                 $port = Application_Model_Preference::GetMailServerPort();
             }
 
-            $config = array(
-                'auth' => 'login',
-                'ssl' => 'ssl',
-                'username' => $username,
-                'password' => $password
-            );
+            if ($mailServerRequiresAuth) {
+                $username = Application_Model_Preference::GetMailServerEmailAddress();
+                $password = Application_Model_Preference::GetMailServerPassword();
+                
+                $config = array(
+                    'auth' => 'login',
+                    'ssl' => 'ssl',
+                    'username' => $username,
+                    'password' => $password
+                );
+            } else {
+                $config = array(
+                    'ssl' => 'ssl'
+                );
+            }
 
             if (isset($port)) {
                 $config['port'] = $port;
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 8d37df41e..48506660e 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -1089,6 +1089,16 @@ class Application_Model_Preference
     {
         return self::getValue("mail_server_port");
     }
+    
+    public static function SetMailServerRequiresAuth($value)
+    {
+        self::setValue("mail_server_requires_auth", $value, false);
+    }
+    
+    public static function GetMailServerRequiresAuth()
+    {
+        return self::getValue("mail_server_requires_auth");
+    }
     /* User specific preferences end */
 
     public static function ShouldShowPopUp()
diff --git a/airtime_mvc/application/views/scripts/form/preferences_email_server.phtml b/airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
index 555cbdded..9aba8a052 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
@@ -44,7 +44,13 @@
                 <label class="required" for="mailServer"><?php echo $this->element->getElement('mailServer')->getLabel() ?>
                 <span class="info-text-small">(Required)</span>:
                 </label>
+                
+                <label class="required" for="msRequiresAuth">
+                    <?php echo $this->element->getElement('msRequiresAuth') ?>
+                    <?php echo $this->element->getElement('msRequiresAuth')->getLabel() ?>
+                </label>
             </dt>
+            
             <dd id="mailServer-element" class="block-display">
                 <?php echo $this->element->getElement('mailServer') ?>
                 <?php if($this->element->getElement('mailServer')->hasErrors()) : ?>
@@ -56,6 +62,14 @@
                 <?php endif; ?> 
             </dd>
             
+            <dt id="port-label" class="block-display">
+                <label class="required" for="port"><?php echo $this->element->getElement('port')->getLabel() ?>:
+                </label>
+            </dt>
+            <dd id="port-element" class="block-display">
+                <?php echo $this->element->getElement('port') ?>
+            </dd>
+            
             <dt id="email-label" class="block-display">
                 <label class="required" for="email"><?php echo $this->element->getElement('email')->getLabel() ?>
                 <span class="info-text-small">(Required)</span>:
@@ -88,14 +102,6 @@
                 <?php endif; ?>
             </dd>
             
-            <dt id="port-label" class="block-display">
-                <label class="required" for="port"><?php echo $this->element->getElement('port')->getLabel() ?>:
-                </label>
-            </dt>
-            <dd id="port-element" class="block-display">
-                <?php echo $this->element->getElement('port') ?>
-            </dd>
-            
             
         <?php } ?>
     </dl>
diff --git a/airtime_mvc/public/js/airtime/preferences/preferences.js b/airtime_mvc/public/js/airtime/preferences/preferences.js
index 5a802e47e..98e5d6c2b 100644
--- a/airtime_mvc/public/js/airtime/preferences/preferences.js
+++ b/airtime_mvc/public/js/airtime/preferences/preferences.js
@@ -20,14 +20,19 @@ function setConfigureMailServerListener() {
     var configMailServer = $("#configureMailServer");
     configMailServer.click(function(event){
         setMailServerInputReadonly();
-    })
+    });
+    
+    var msRequiresAuth = $("#msRequiresAuth");
+    msRequiresAuth.click(function(event){
+        setMsAuthenticationFieldsReadonly($(this));
+    });
 }
 
 function setEnableSystemEmailsListener() {
     var enableSystemEmails = $("#enableSystemEmail");
     enableSystemEmails.click(function(event){
         setSystemFromEmailReadonly();
-    })
+    });
 }
 
 function setSystemFromEmailReadonly() {
@@ -43,19 +48,36 @@ function setSystemFromEmailReadonly() {
 function setMailServerInputReadonly() {
     var configMailServer = $("#configureMailServer");
     var mailServer = $("#mailServer");
-    var email = $("#email");
-    var password = $("#ms_password");
     var port = $("#port");
-    if ($(configMailServer).is(':checked')) {
+    var requiresAuthCB = $("#msRequiresAuth");
+    
+    if (configMailServer.is(':checked')) {
         mailServer.removeAttr("readonly");
-        email.removeAttr("readonly");
-        password.removeAttr("readonly");
         port.removeAttr("readonly");
+        requiresAuthCB.parent().show();
     } else {
         mailServer.attr("readonly", "readonly");
+        port.attr("readonly", "readonly");
+        requiresAuthCB.parent().hide();
+    }
+    
+    setMsAuthenticationFieldsReadonly(requiresAuthCB);
+}
+
+/*
+ * Enable/disable mail server authentication fields
+ */
+function setMsAuthenticationFieldsReadonly(ele) {
+    var email = $("#email");
+    var password = $("#ms_password");
+    var configureMailServer = $("#configureMailServer");
+    
+    if (ele.is(':checked') && configureMailServer.is(':checked')) {
+        email.removeAttr("readonly");
+        password.removeAttr("readonly");
+    } else if (ele.not(':checked') || configureMailServer.not(':checked')) {
         email.attr("readonly", "readonly");
         password.attr("readonly", "readonly");
-        port.attr("readonly", "readonly");
     }
 }