diff --git a/src/App.php b/src/App.php
index 79e8428705..5d557738da 100644
--- a/src/App.php
+++ b/src/App.php
@@ -375,7 +375,7 @@ class App
 			$adapterType = $this->config->get('system', 'config_adapter');
 			$adapter = ConfigFactory::createConfig($adapterType, $this->config);
 			Core\Config::setAdapter($adapter);
-			$adapterP = ConfigFactory::createConfig($adapterType, $this->config);
+			$adapterP = ConfigFactory::createPConfig($adapterType, $this->config);
 			Core\PConfig::setAdapter($adapterP);
 			Core\Config::load();
 		}
diff --git a/src/Core/Config/ConfigCache.php b/src/Core/Config/ConfigCache.php
index d7318537e9..b50ba3e004 100644
--- a/src/Core/Config/ConfigCache.php
+++ b/src/Core/Config/ConfigCache.php
@@ -121,7 +121,7 @@ class ConfigCache implements IConfigCache, IPConfigCache
 
 		if (isset($this->config[$uid][$cat][$key])) {
 			$return = $this->config[$uid][$cat][$key];
-		} elseif ($key == null && isset($this->config[$uid][$cat])) {
+		} elseif ($key === null && isset($this->config[$uid][$cat])) {
 			$return = $this->config[$uid][$cat];
 		}
 
diff --git a/src/Core/Config/PreloadPConfigAdapter.php b/src/Core/Config/PreloadPConfigAdapter.php
index 311518bbe9..ed18bdf2e7 100644
--- a/src/Core/Config/PreloadPConfigAdapter.php
+++ b/src/Core/Config/PreloadPConfigAdapter.php
@@ -23,13 +23,15 @@ class PreloadPConfigAdapter implements IPConfigAdapter
 	private $config;
 
 	/**
-	 * @param int           $uid    The UID of the current user
 	 * @param IPConfigCache $config The config cache of this adapter
+	 * @param int           $uid    The UID of the current user
 	 */
-	public function __construct($uid, $config)
+	public function __construct($config, $uid = null)
 	{
 		$this->config = $config;
-		$this->load($uid, 'config');
+		if (isset($uid)) {
+			$this->load($uid, 'config');
+		}
 	}
 
 	public function load($uid, $family)
diff --git a/src/Factory/ConfigFactory.php b/src/Factory/ConfigFactory.php
index 4ab20d1d56..46d55b30c3 100644
--- a/src/Factory/ConfigFactory.php
+++ b/src/Factory/ConfigFactory.php
@@ -36,15 +36,15 @@ class ConfigFactory
 
 	/**
 	 * @param string               $type   The adapter type
-	 * @param int                  $uid    The UID of the current user
 	 * @param Config\IPConfigCache $config The config cache of this adapter
+	 * @param int                  $uid    The UID of the current user
 	 *
 	 * @return Config\IPConfigAdapter
 	 */
-	public static function createPConfig($type, $uid, $config)
+	public static function createPConfig($type, $config, $uid = null)
 	{
 		if ($type == 'preload') {
-			return new Config\PreloadPConfigAdapter($uid, $config);
+			return new Config\PreloadPConfigAdapter($config, $uid);
 		} else {
 			return new Config\JITPConfigAdapter($config);
 		}