diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index 247635b33d..30202bbd93 100755
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -45,43 +45,13 @@ if (php_sapi_name() !== 'cli') {
 }
 
 use Dice\Dice;
-use Friendica\App\Mode;
-use Friendica\Core\Logger\Capability\LogChannel;
-use Friendica\Security\ExAuth;
-use Psr\Log\LoggerInterface;
 
-if (sizeof($_SERVER["argv"]) == 0) {
-	die();
-}
+chdir(dirname(__FILE__, 2));
 
-$directory = dirname($_SERVER["argv"][0]);
+require dirname(__FILE__, 2) . '/vendor/autoload.php';
 
-if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR) {
-	$directory = $_SERVER["PWD"] . DIRECTORY_SEPARATOR . $directory;
-}
+$dice = (new Dice())->addRules(require(dirname(__FILE__, 2) . '/static/dependencies.config.php'));
 
-$directory = realpath($directory . DIRECTORY_SEPARATOR . "..");
+$app = \Friendica\App::fromDice($dice);
 
-chdir($directory);
-
-require dirname(__DIR__) . '/vendor/autoload.php';
-
-$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
-$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
-$dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies'));
-$dice = $dice->addRule(LoggerInterface::class,['constructParams' => [LogChannel::AUTH_JABBERED]]);
-
-\Friendica\DI::init($dice);
-\Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));
-
-// Check the database structure and possibly fixes it
-\Friendica\Core\Update::check(\Friendica\DI::basePath(), true);
-
-$appMode = $dice->create(Mode::class);
-
-if ($appMode->isNormal()) {
-	/** @var ExAuth $oAuth */
-	$oAuth = $dice->create(ExAuth::class);
-	$oAuth->readStdin();
-}
+$app->processEjabberd();
diff --git a/src/App.php b/src/App.php
index 2c236390d1..98c12cd579 100644
--- a/src/App.php
+++ b/src/App.php
@@ -23,12 +23,14 @@ use Friendica\Database\Definition\ViewDefinition;
 use Friendica\Module\Maintenance;
 use Friendica\Security\Authentication;
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\Logger\Capability\LogChannel;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ATProtocol\DID;
+use Friendica\Security\ExAuth;
 use Friendica\Security\OpenWebAuth;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\HTTPInputData;
@@ -121,7 +123,15 @@ class App
 
 	public function processRequest(ServerRequestInterface $request, float $start_time): void
 	{
-		$this->setupContainerForRunningFrontend($request);
+		$this->setupContainerForAddons();
+
+		$this->container = $this->container->addRule(Mode::class, [
+			'call' => [
+				['determineRunMode', [false, $request->getServerParams()], Dice::CHAIN_CALL],
+			],
+		]);
+
+		$this->setupLegacyServiceLocator();
 
 		$this->registerErrorHandler();
 
@@ -156,18 +166,40 @@ class App
 		);
 	}
 
-	private function setupContainerForRunningFrontend(ServerRequestInterface $request): void
+	public function processEjabberd(): void
+	{
+		$this->setupContainerForAddons();
+
+		$this->container = $this->container->addRule(LoggerInterface::class,[
+			'constructParams' => [LogChannel::AUTH_JABBERED],
+		]);
+
+		$this->setupLegacyServiceLocator();
+
+		$this->registerErrorHandler();
+
+		// Check the database structure and possibly fixes it
+		\Friendica\Core\Update::check(\Friendica\DI::basePath(), true);
+
+		$appMode = $this->container->create(Mode::class);
+
+		if ($appMode->isNormal()) {
+			/** @var ExAuth $oAuth */
+			$oAuth = $this->container->create(ExAuth::class);
+			$oAuth->readStdin();
+		}
+	}
+
+	private function setupContainerForAddons(): void
 	{
 		/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
 		$addonLoader = $this->container->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
 
 		$this->container = $this->container->addRules($addonLoader->getActiveAddonConfig('dependencies'));
-		$this->container = $this->container->addRule(Mode::class, [
-			'call' => [
-				['determineRunMode', [false, $request->getServerParams()], Dice::CHAIN_CALL],
-			],
-		]);
+	}
 
+	private function setupLegacyServiceLocator(): void
+	{
 		\Friendica\DI::init($this->container);
 	}