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'