diff --git a/doc/rpm-build/post_install.php b/doc/rpm-build/post_install.php
index 5491824b76..978c12b53f 100755
--- a/doc/rpm-build/post_install.php
+++ b/doc/rpm-build/post_install.php
@@ -778,7 +778,7 @@ function set_univention_defaults()
 			if (!is_array($domains)) $domains = explode("\n", $domains);
 			$domain = array_shift($domains);
 			$config['smtpserver'] = "$mailserver,465,,,yes,tls";
-			$config['smtp'] = ',emailadmin_smtp_ldap_univention';
+			$config['smtp'] = ',emailadmin_smtp_univention';
 			$config['mailserver'] = "$mailserver,993,$domain,email,tls";
 			$config['imap'] = /*'cyrus,'._ucr_secret('cyrus')*/','.',emailadmin_imap_cyrus';
 			$config['folder'] = 'INBOX/Sent,INBOX/Trash,INBOX/Drafts,INBOX/Templates,INBOX/Spam';
diff --git a/setup/inc/class.setup_cmd_config.inc.php b/setup/inc/class.setup_cmd_config.inc.php
index 6cfc89d613..2ad8a3cbf7 100644
--- a/setup/inc/class.setup_cmd_config.inc.php
+++ b/setup/inc/class.setup_cmd_config.inc.php
@@ -473,9 +473,10 @@ class setup_cmd_config extends setup_cmd
 	/**
 	 * Read auth-types (existing auth backends) from filesystem and fix our $options array
 	 *
+	 * @param string $current =null current value, to allways return it
 	 * @return array
 	 */
-	static function account_repositories()
+	static function account_repositories($current=null)
 	{
 		static $account_repositories = array(
 			'sql' => 'SQL',
@@ -492,7 +493,7 @@ class setup_cmd_config extends setup_cmd
 				if (preg_match('/^class\.accounts_([a-z]+)\.inc\.php$/', $file, $matches) &&
 					!isset($account_repositories[$matches[1]]) &&
 					class_exists($class='accounts_'.$matches[1]) &&
-					(!is_callable($callable=$class.'::available') || call_user_func($callable)))
+					($matches[1] == $current || !is_callable($callable=$class.'::available') || call_user_func($callable)))
 				{
 					$account_repositories[$matches[1]] = ucfirst($matches[1]);
 				}
diff --git a/setup/inc/hook_config.inc.php b/setup/inc/hook_config.inc.php
index 0779a36d69..bde7223656 100644
--- a/setup/inc/hook_config.inc.php
+++ b/setup/inc/hook_config.inc.php
@@ -193,7 +193,7 @@ function auth_type_activesync($config)
  */
 function account_repository($config)
 {
-	return _options_from(setup_cmd_config::account_repositories(), $config['account_repository']);
+	return _options_from(setup_cmd_config::account_repositories($config['account_repository']), $config['account_repository']);
 }
 
 /**