diff --git a/lib/setup.php b/lib/setup.php
index 56f66945c2bbdf8678e3645ba13e20d72d5a89f5..4e4a32e7362782eb52952de866382dbb92862497 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -202,7 +202,7 @@ class OC_Setup {
 		return $error;
 	}
 
-	private static function setupMySQLDatabase($dbhost, $dbuser, $dbpass, $dbtableprefix, $username) {
+	private static function setupMySQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username) {
 		//check if the database user has admin right
 		$connection = @mysql_connect($dbhost, $dbuser, $dbpass);
 		if(!$connection) {
@@ -218,7 +218,7 @@ class OC_Setup {
 			$dbusername=substr('oc_'.$username, 0, 16);
 			if($dbusername!=$oldUser) {
 				//hash the password so we don't need to store the admin config in the config file
-				$dbpassword=md5(time().$password);
+				$dbpassword=md5(time().$dbpass);
 
 				self::createDBUser($dbusername, $dbpassword, $connection);