diff --git a/lib/base.php b/lib/base.php
index 86005a96954..f619864acb6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -1027,6 +1027,7 @@ class OC {
 
 		// Always load authentication apps
 		OC_App::loadApps(['authentication']);
+		OC_App::loadApps(['extended_authentication']);
 
 		// Load minimum set of apps
 		if (!\OCP\Util::needUpgrade()
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index 45c22dc89bc..2ca4c662a85 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -331,7 +331,7 @@ class Updater extends BasicEmitter {
 	 */
 	protected function doAppUpgrade(): void {
 		$apps = \OC_App::getEnabledApps();
-		$priorityTypes = ['authentication', 'filesystem', 'logging'];
+		$priorityTypes = ['authentication', 'extended_authentication', 'filesystem', 'logging'];
 		$pseudoOtherType = 'other';
 		$stacks = [$pseudoOtherType => []];
 
diff --git a/ocs/v1.php b/ocs/v1.php
index 3fba48b13c8..05539899372 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -50,6 +50,7 @@ use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 try {
 	OC_App::loadApps(['session']);
 	OC_App::loadApps(['authentication']);
+	OC_App::loadApps(['extended_authentication']);
 
 	// load all apps to get all api routes properly setup
 	// FIXME: this should ideally appear after handleLogin but will cause
diff --git a/public.php b/public.php
index d9d15d7d542..2956d7f79dd 100644
--- a/public.php
+++ b/public.php
@@ -66,6 +66,7 @@ try {
 	// Load all required applications
 	\OC::$REQUESTEDAPP = $app;
 	OC_App::loadApps(['authentication']);
+	OC_App::loadApps(['extended_authentication']);
 	OC_App::loadApps(['filesystem', 'logging']);
 
 	if (!\OC::$server->getAppManager()->isInstalled($app)) {
diff --git a/remote.php b/remote.php
index 43376424af8..0c33fabc762 100644
--- a/remote.php
+++ b/remote.php
@@ -153,6 +153,7 @@ try {
 	// Load all required applications
 	\OC::$REQUESTEDAPP = $app;
 	OC_App::loadApps(['authentication']);
+	OC_App::loadApps(['extended_authentication']);
 	OC_App::loadApps(['filesystem', 'logging']);
 
 	switch ($app) {
diff --git a/resources/app-info-shipped.xsd b/resources/app-info-shipped.xsd
index c11264142eb..ddf8a010f3e 100644
--- a/resources/app-info-shipped.xsd
+++ b/resources/app-info-shipped.xsd
@@ -340,6 +340,7 @@
             <xs:element name="prelogin" minOccurs="0" maxOccurs="1"/>
             <xs:element name="filesystem" minOccurs="0" maxOccurs="1"/>
             <xs:element name="authentication" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="extended_authentication" minOccurs="0" maxOccurs="1"/>
             <xs:element name="logging" minOccurs="0" maxOccurs="1"/>
             <xs:element name="dav" minOccurs="0" maxOccurs="1"/>
             <xs:element name="prevent_group_restriction" minOccurs="0"
diff --git a/resources/app-info.xsd b/resources/app-info.xsd
index 191c8ed7c5b..43f241cb73d 100644
--- a/resources/app-info.xsd
+++ b/resources/app-info.xsd
@@ -336,6 +336,7 @@
             <xs:element name="prelogin" minOccurs="0" maxOccurs="1"/>
             <xs:element name="filesystem" minOccurs="0" maxOccurs="1"/>
             <xs:element name="authentication" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="extended_authentication" minOccurs="0" maxOccurs="1"/>
             <xs:element name="logging" minOccurs="0" maxOccurs="1"/>
             <xs:element name="dav" minOccurs="0" maxOccurs="1"/>
             <xs:element name="prevent_group_restriction" minOccurs="0"