diff --git a/appinfo/app.php b/appinfo/app.php
index cb4ccd425..f29ab5b39 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -53,7 +53,6 @@
 );
 $userBackend->registerBackends(\OC::$server->getUserManager()->getBackends());
 OC_User::useBackend($userBackend);
-OC_User::handleApacheAuth();
 
 // Setting up the one login config may fail, if so, do not catch the requests later.
 $returnScript = false;
@@ -74,6 +73,10 @@
 		return;
 }
 
+if ($type === 'environment-variable') {
+	OC_User::handleApacheAuth();
+}
+
 if($returnScript === true) {
 	return;
 }