diff --git a/install/autoupdate.php b/install/autoupdate.php
index b77ff49b388c24639561e725b1c90b752774cacc..a9863cee2dd362528573001d01826616ae9f0d79 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -156,6 +156,7 @@ prepareDBDump();
 
 //* initialize the database
 $inst->db = new db();
+$inst->db->dbName = $conf["mysql"]["database"];
 
 /*
  * The next line is a bit tricky!
diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
index 7d2464b07efb345adbb585ce7219861c35e63333..d95bbf8043bc63e5993d8b5a0bd3175d1530f2fd 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -286,7 +286,8 @@ function updateDbAndIni() {
 	}
 
 	$new_ini = array_to_ini($tpl_ini_array);
-	$inst->db->query("UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id']);
+	$sql = "UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id'];
+	$inst->db->query($sql);
 	unset($old_ini_array);
 	unset($tpl_ini_array);
 	unset($new_ini);
diff --git a/install/update.php b/install/update.php
index f88883398f6f36e30533fc5d872845f926c27ff0..54dfd271d70398d490d82562352fae0238fbfd58 100644
--- a/install/update.php
+++ b/install/update.php
@@ -152,6 +152,7 @@ prepareDBDump();
 
 //* initialize the database
 $inst->db = new db();
+$inst->db->dbName = $conf["mysql"]["database"];
 
 //* initialize the master DB, if we have a multiserver setup
 if($conf['mysql']['master_slave_setup'] == 'y') {