diff --git a/lib/private/setup/postgresql.php b/lib/private/setup/postgresql.php
index 0a559e7a58..59762209d0 100644
--- a/lib/private/setup/postgresql.php
+++ b/lib/private/setup/postgresql.php
@@ -66,7 +66,8 @@ class PostgreSQL extends AbstractDatabase {
 			$this->createDBUser($connection);
 		}
 
-		\OC_Config::setValues([
+		$systemConfig = \OC::$server->getSystemConfig();
+		$systemConfig->setValues([
 			'dbuser'		=> $this->dbUser,
 			'dbpassword'	=> $this->dbPassword,
 		]);
@@ -78,8 +79,8 @@ class PostgreSQL extends AbstractDatabase {
 		pg_close($connection);
 
 		// connect to the ownCloud database (dbname=$this->dbname) and check if it needs to be filled
-		$this->dbUser = \OC_Config::getValue('dbuser');
-		$this->dbPassword = \OC_Config::getValue('dbpassword');
+		$this->dbUser = $systemConfig->getValue('dbuser');
+		$this->dbPassword = $systemConfig->getValue('dbpassword');
 
 		$e_host = addslashes($this->dbHost);
 		$e_dbname = addslashes($this->dbName);
diff --git a/lib/private/setup/sqlite.php b/lib/private/setup/sqlite.php
index 820a89d4cf..ce6005620e 100644
--- a/lib/private/setup/sqlite.php
+++ b/lib/private/setup/sqlite.php
@@ -31,7 +31,7 @@ class Sqlite extends AbstractDatabase {
 	}
 
 	public function setupDatabase($username) {
-		$datadir = \OC_Config::getValue('datadirectory');
+		$datadir = \OC::$server->getSystemConfig()->getValue('datadirectory');
 
 		//delete the old sqlite database first, might cause infinte loops otherwise
 		if(file_exists("$datadir/owncloud.db")) {