diff --git a/setup/inc/hook_config.inc.php b/setup/inc/hook_config.inc.php
index 6c73b94f04..3563494ed4 100644
--- a/setup/inc/hook_config.inc.php
+++ b/setup/inc/hook_config.inc.php
@@ -235,6 +235,10 @@ function auth_type_activesync($config)
 {
 	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_activesync']);
 }
+function auth_type_smtp($config)
+{
+    return _options_from(emailadmin_ui::getSMTPAuthConfig(),$config['smtpAuth']);
+}
 
 /**
  * Returns options string
diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl
index 4d6c1d7709..5d5d9ed7d4 100644
--- a/setup/templates/default/config.tpl
+++ b/setup/templates/default/config.tpl
@@ -184,7 +184,7 @@
      </select>
     </td>
    </tr>
-   <tr class="row_on"">
+   <tr class="row_on">
     <td>{lang_Mail_server_login_type}:</td>
     <td>
      <select name="newsettings[mail_login_type]">{hook_mail_login_type}</select>
@@ -203,14 +203,18 @@
     <td><input name="newsettings[smtp_port]" value="{value_smtp_port}"></td>
    </tr>
    <tr class="row_on">
+    <td>{lang_SMTP-authentication_required}:</td>
+    <td><select name="newsettings[smtpAuth]"> {hook_auth_type_smtp}</select></td>
+   </tr>
+   <tr class="row_off">
     <td>{lang_User_for_SMTP-authentication_(leave_it_empty_if_no_auth_required)}:</td>
     <td><input name="newsettings[smtp_auth_user]" value="{value_smtp_auth_user}"></td>
    </tr>
-   <tr class="row_off">
+   <tr class="row_on">
     <td>{lang_Password_for_SMTP-authentication}:</td>
     <td><input type="password" name="newsettings[smtp_auth_passwd]" value="{value_smtp_auth_passwd}"></td>
    </tr>
-   <tr class="row_on">
+   <tr class="row_off">
     <td colspan="2">&nbsp;</td>
    </tr>