diff --git a/install/install.php b/install/install.php
index 20144a6dd3f91d99e1db91a992f9d2fa79874ffa..a8431b2248a43b0b73ed939ac03d2490eadb32cc 100644
--- a/install/install.php
+++ b/install/install.php
@@ -583,14 +583,6 @@ 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 = ?, web_server = ?, dns_server = ?, file_server = ?, db_server = ?, proxy_server = ?, firewall_server = ? WHERE server_id = ?";
-$inst->db->query($sql, $conf['mysql']['database'].'.server', ($conf['services']['mail'] ? 1 : 0), ($conf['services']['web'] ? 1 : 0), ($conf['services']['dns'] ? 1 : 0), ($conf['services']['file'] ? 1 : 0), ($conf['services']['db'] ? 1 : 0), ($conf['services']['proxy'] ? 1 : 0), ($conf['services']['firewall'] ? 1 : 0), $conf['server_id']);
-if($conf['mysql']['master_slave_setup'] == 'y') {
-	$inst->dbmaster->query($sql, $conf['mysql']['master_database'].'.server', ($conf['services']['mail'] ? 1 : 0), ($conf['services']['web'] ? 1 : 0), ($conf['services']['dns'] ? 1 : 0), ($conf['services']['file'] ? 1 : 0), ($conf['services']['db'] ? 1 : 0), ($conf['services']['proxy'] ? 1 : 0), ($conf['services']['firewall'] ? 1 : 0), $conf['server_id']);
-}
-
-
 //* test tRNG
 if($conf['tRNG']) tRNG();
 
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 6d1ddf72dd6a1b86bd1d3edbe9c9a15016421df1..e469634b3865f68c38ca56b0175338b18af5645d 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -280,7 +280,7 @@ class installer_base {
 
 		// Delete ISPConfig user in the local database, in case that it exists
 		$this->db->query("DROP USER ?@?", $conf['mysql']['ispconfig_user'], $from_host);
-		$this->db->query("DROP DATABASE IF EXISTS ?", $conf['mysql']['database']);
+		$this->db->query("DROP DATABASE IF EXISTS ??", $conf['mysql']['database']);
 
 		//* Create the ISPConfig database user in the local database
 		$query = 'GRANT SELECT, INSERT, UPDATE, DELETE ON ?? TO ?@? IDENTIFIED BY ?';
@@ -2237,7 +2237,7 @@ class installer_base {
 		$proxy_server_enabled = ($conf['services']['proxy'])?1:0;
 		$firewall_server_enabled = ($conf['services']['firewall'])?1:0;
 
-		$sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', proxy_server = '$proxy_server_enabled', firewall_server = '$firewall_server_enabled WHERE server_id = ?";
+		$sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', proxy_server = '$proxy_server_enabled', firewall_server = '$firewall_server_enabled' WHERE server_id = ?";
 
 		$this->db->query($sql, $conf['server_id']);
 		if($conf['mysql']['master_slave_setup'] == 'y') {