diff --git a/setup/inc/class.setup_cmd_config.inc.php b/setup/inc/class.setup_cmd_config.inc.php
index e36d4ec9ac..b8c1dedbee 100644
--- a/setup/inc/class.setup_cmd_config.inc.php
+++ b/setup/inc/class.setup_cmd_config.inc.php
@@ -173,8 +173,9 @@ class setup_cmd_config extends setup_cmd
 			array('name' => 'editforwardingaddress','allowed' => array('yes',null)),
 			array('name' => 'smtpType','default' => 'postfixldap'),
 		),
-		'--smtpserver' => array(	//smtp server,[smtp port],[smtp user],[smtp password]
-			'smtp_server',array('name' => 'smtp_port','default' => 25),'smtp_auth_user','smtp_auth_passwd',''
+		'--smtpserver' => array(	//smtp server,[smtp port],[smtp user],[smtp password],[auth=no|yes|ann]
+			'smtp_server',array('name' => 'smtp_port','default' => 25),'smtp_auth_user','smtp_auth_passwd',
+			array('name' => 'smtpAuth', 'default' => 'no', 'allowed' => array('no', 'yes', 'ann')),
 		),
 		'--account-auth' => array(
 			array('name' => 'account_repository','allowed' => array('sql','ldap','ads'),'default'=>'sql'),
@@ -307,7 +308,7 @@ class setup_cmd_config extends setup_cmd
 		{
 			$config[$row['config_name']] = $row['config_value'];
 		}
-		$config['smtpAuth'] = $config['smtp_auth_user'] ? 'yes' : null;
+		if (!$config['smtpAuth']) $config['smtpAuth'] = $config['smtp_auth_user'] ? 'yes' : null;
 
 		$emailadmin = new emailadmin_bo(false,false);	// false=no session stuff
 		$emailadmin->setDefaultProfile($config);
diff --git a/setup/setup-cli.php b/setup/setup-cli.php
index 680829793e..8f14d9ac01 100755
--- a/setup/setup-cli.php
+++ b/setup/setup-cli.php
@@ -481,7 +481,7 @@ function do_usage($what='')
 		echo '	--files-dir, --backup-dir, --temp-dir '.lang('path to various directories: have to exist and be writeable by the webserver')."\n";
 		echo '	--webserver-url '.lang('eg. /egroupware or http://domain.com/egroupware, default: %1',str_replace('/setup/setup-cli.php','',$_SERVER['PHP_SELF']))."\n";
 		echo '	--mailserver '.lang('host,{imap | imaps },[domain],[{standard(default)|vmailmgr = add domain for mailserver login}]')."\n";
-		echo '	--smtpserver '.lang('host,[smtp port],[smtp user],[smtp password]')."\n";
+		echo '	--smtpserver '.lang('host,[smtp port],[smtp user],[smtp password],[auth=no|yes|ann]')."\n";
 		echo '	--smtp '.lang('MTA (with LDAP): [yes(user edit forwarding)],(defaultsmtp|postfix(ldap|dbmailuser)|emailadmin_smtp_(ldap|ads|mandriva|suse|sql))')."\n";
 		echo '	--imap '.lang('IMAP: Admin user,Password,(defaultimap|cyrusimap|emailadmin_dovecot)')."\n";
 		echo '	--sieve '.lang('Sieve: Host[,Port(4190)]')."\n";