diff --git a/install/install.php b/install/install.php
index 1dd3bcf1a08beea5437a0a2e85b68ad4cd29e1c8..57953539e35c601881ede27774e80b026b9a269a 100644
--- a/install/install.php
+++ b/install/install.php
@@ -556,7 +556,6 @@ $inst->configure_dbserver();
 //* Configure ISPConfig
 swriteln('Installing ISPConfig crontab');
 if($conf['cron']['installed']) {
-	swriteln('Installing ISPConfig crontab');
 	$inst->install_crontab();
 } else swriteln('[ERROR] Cron not found');
 
@@ -584,6 +583,14 @@ if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '') sys
 if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '') system($inst->getinitcommand($conf['nginx']['init_script'], 'restart').' &> /dev/null');
 if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '') system($inst->getinitcommand($conf['ufw']['init_script'], 'restart').' &> /dev/null');
 
+//** update server services in DB
+$sql = "UPDATE ?? SET mail_server = '{$conf['services']['mail']}', web_server = '{$conf['services']['web']}', dns_server = '{$conf['services']['dns']}', file_server = '{$conf['services']['file']}', db_server = '{$conf['services']['db']}', proxy_server = '{$conf['services']['proxy']}', firewall_server = '$firewall_server_enabled' WHERE server_id = ?";
+$inst->db->query($sql, $conf['mysql']['database'].'.server', $conf['server_id']);
+if($conf['mysql']['master_slave_setup'] == 'y') {
+	$inst->dbmaster->query($sql, $conf['mysql']['master_database'].'.server', $conf['server_id']);
+}
+
+
 //* test tRNG
 if($conf['tRNG']) tRNG();
 
diff --git a/install/tpl/rspamd_users.inc.conf.master b/server/conf/rspamd_users.inc.conf.master
similarity index 100%
rename from install/tpl/rspamd_users.inc.conf.master
rename to server/conf/rspamd_users.inc.conf.master