diff --git a/index.php b/index.php
index b85c49c76c26bb8e6925364d3dcb52822a8d665e..a3835c6d2f3b106b65e34389937659f42de2a5fb 100644
--- a/index.php
+++ b/index.php
@@ -57,6 +57,7 @@ elseif(OC_User::isLoggedIn()) {
 		exit();
 	}
 	else {
+		OC_App::loadApps();
 		if(is_null(OC::$REQUESTEDFILE)){
 			OC::loadapp();
 		}else{
diff --git a/lib/base.php b/lib/base.php
index 5478f084392ae279f0b1e18923b9edc56ccdc9ea..fa5287631d88cb5c2bc1f21fb55c49cc4a52c118 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -274,7 +274,6 @@ class OC{
 	
 	public static function loadapp(){
 		if(file_exists(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP)){
-			OC_App::loadApps();
 			require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/index.php');
 		}else{
 			trigger_error('The requested App was not found.', E_USER_ERROR);