1 files changed, 2 insertions, 1 deletions
diff --git a/lib/user.php b/lib/user.php
index da774ff86f0..ed75b0bc17c 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -177,6 +177,7 @@ class OC_User {
 	 * setup the configured backends in config.php
 	 */
 	public static function setupBackends() {
+		OC_App::loadApps(array('prelogin'));
 		$backends = OC_Config::getValue('user_backends', array());
 		foreach ($backends as $i => $config) {
 			$class = $config['class'];
@@ -419,7 +420,7 @@ class OC_User {
 		$manager = self::getManager();
 		$username = $manager->checkPassword($uid, $password);
 		if ($username !== false) {
-			return $manager->get($username)->getUID();
+			return $username->getUID();
 		}
 		return false;
 	}