diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
index 57fb1934408364e2c2eef66eb757b4c099686d6d..0cd71165684f7baf9a6cf4db29c74eab8938f47a 100644
--- a/install/dist/lib/debian60.lib.php
+++ b/install/dist/lib/debian60.lib.php
@@ -111,7 +111,10 @@ class installer extends installer_base {
 			}
 			if(version_compare($dovecot_version,2.2) >= 0) {
 				// Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9
-				replaceLine($config_dir.'/'.$configfile, 'ssl_protocols = !SSLv2 !SSLv3', 'ssl_protocols = !SSLv3', 1, 0);
+				$content = file_get_contents($config_dir.'/'.$configfile);
+				$content = str_replace('!SSLv2','',$content);
+				file_put_contents($config_dir.'/'.$configfile,$content);
+				unset($content);
 			}
 		} else {
 			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot.conf.master')) {
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 8aa75c9d0752dd8ccb8de5917a03656cab6eba9c..418c47c6702c60c8f91f244ec517f632a9ddecbd 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -443,6 +443,13 @@ class installer_dist extends installer_base {
 			if(version_compare($dovecot_version,2.1) < 0) {
 				removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');
 			}
+			if(version_compare($dovecot_version,2.2) >= 0) {
+				// Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9
+				$content = file_get_contents($config_dir.'/'.$configfile);
+				$content = str_replace('!SSLv2','',$content);
+				file_put_contents($config_dir.'/'.$configfile,$content);
+				unset($content);
+			}
 			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
 			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = webmaster@localhost', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
 		} else {
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 6db51c35227e2e0e083b7231ad193d5babeb9838..421afa3fc71584dd9ea7686df9d8b5c2f0c7dd33 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1292,7 +1292,10 @@ class installer_base {
 			}
 			if(version_compare($dovecot_version,2.2) >= 0) {
 				// Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9
-				replaceLine($config_dir.'/'.$configfile, 'ssl_protocols = !SSLv2 !SSLv3', 'ssl_protocols = !SSLv3', 1, 0);
+				$content = file_get_contents($config_dir.'/'.$configfile);
+				$content = str_replace('!SSLv2','',$content);
+				file_put_contents($config_dir.'/'.$configfile,$content);
+				unset($content);
 			}
 		}
 
diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master
index 535bed783fa426625d77aea5b463c417124b28a8..42a003b9c1179f236ca2e843470bd457d158e5c7 100644
--- a/install/tpl/system.ini.master
+++ b/install/tpl/system.ini.master
@@ -14,6 +14,8 @@ mailbox_show_custom_rules_tab=y
 mailboxlist_webmail_link=y
 webmail_url=/webmail
 dkim_path=/var/lib/amavis/dkim
+smtp_enabled=y
+smtp_host=localhost
 
 [monitor]
 
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 681d166b34c729a824902385c77d8cbfb3795f75..449805f3c17a179df4a468de3477fbc0336009cb 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -311,7 +311,7 @@ $form["tabs"]['mail'] = array (
 		'smtp_enabled' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
-			'default' => 'n',
+			'default' => 'y',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		'smtp_host' => array (
@@ -328,7 +328,7 @@ $form["tabs"]['mail'] = array (
 					'type' => 'STRIPNL')
 			),
 			'formtype' => 'TEXT',
-			'default' => '',
+			'default' => 'localhost',
 			'value'  => '',
 			'width'  => '30',
 			'maxlength' => '255'
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 6a026d447a6862984e56b8471eb32d09a8d2ae65..2ec0e153e092452bb4526e45f0d9f0c1d629e250 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -252,16 +252,16 @@
 </tmpl_if>
 <tmpl_if name='php' op='==' value='cgi'>
 		# php as cgi enabled
-		ScriptAlias /php5-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
-		Action php5-cgi /php5-cgi
+		ScriptAlias /php-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
+		Action php-cgi /php-cgi
 		<Directory {tmpl_var name='web_document_root_www'}>
 			<FilesMatch "\.php[345]?$">
-				SetHandler php5-cgi
+				SetHandler php-cgi
 			</FilesMatch>
 		</Directory>
 		<Directory {tmpl_var name='web_document_root'}>
 			<FilesMatch "\.php[345]?$">
-				SetHandler php5-cgi
+				SetHandler php-cgi
 			</FilesMatch>
 		</Directory>
 		<Directory {tmpl_var name='cgi_starter_path'}>
@@ -346,21 +346,21 @@
 			    </Directory>
 				<Directory {tmpl_var name='web_document_root_www'}>
 					<FilesMatch "\.php[345]?$">
-						SetHandler php5-fcgi
+						SetHandler php-fcgi
 					</FilesMatch>
 				</Directory>
 				<Directory {tmpl_var name='web_document_root'}>
 					<FilesMatch "\.php[345]?$">
-						SetHandler php5-fcgi
+						SetHandler php-fcgi
 					</FilesMatch>
 				</Directory>
-                Action php5-fcgi /php5-fcgi virtual
-				Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
+                Action php-fcgi /php-fcgi virtual
+				Alias /php-fcgi {tmpl_var name='document_root'}/cgi-bin/php-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
 <tmpl_if name='use_tcp'>
-                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization  -pass-header Content-Type    
+                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization  -pass-header Content-Type    
 </tmpl_if>
 <tmpl_if name='use_socket'>
-                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket <tmpl_var name='fpm_socket'> -pass-header Authorization  -pass-header Content-Type
+                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket <tmpl_var name='fpm_socket'> -pass-header Authorization  -pass-header Content-Type
 </tmpl_if>
 		</IfModule>
 		<IfModule mod_proxy_fcgi.c>
@@ -468,7 +468,7 @@
 		</tmpl_if>
 <tmpl_if name="rewrite_is_url" op="==" value="n">
 		RewriteCond %{REQUEST_URI} !^/webdav/
-		RewriteCond %{REQUEST_URI} !^/php5-fcgi/
+		RewriteCond %{REQUEST_URI} !^/php-fcgi/
 		RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
 </tmpl_if>