diff --git a/setup/inc/class.setup_cmd_config.inc.php b/setup/inc/class.setup_cmd_config.inc.php
index a4bd6a9b49..a2a5048d01 100644
--- a/setup/inc/class.setup_cmd_config.inc.php
+++ b/setup/inc/class.setup_cmd_config.inc.php
@@ -83,6 +83,8 @@ class setup_cmd_config extends setup_cmd
 		{
 			if ($save_ea_profile) $this->_save_ea_profile();
 
+			$this->restore_db();
+
 			return lang('Configuration changed.');
 		}
 		$this->restore_db();
@@ -361,6 +363,8 @@ class setup_cmd_config extends setup_cmd
 		$defaults['mail_suffix'] = '$domain';
 		$defaults['imapAdminUsername'] = 'cyrus@$domain';
 		$defaults['imapAdminPW'] = self::randomstring();
+		$defaults['imapType'] = 2;	// standard IMAP
+		$defaults['smtpType'] = 1;	// standard SMTP
 
 		return $defaults;
 	}