diff --git a/appinfo/info.xml b/appinfo/info.xml
index 6c90f4c9f33235c29da24a7c87c516975b457db9..923f9adee5dc7d951f85d6abe662706c5675cc58 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -10,7 +10,7 @@
     <description><![CDATA[in /e/OS cloud, nextcloud accounts are linked to mail accounts. This app ensures both are coordinated: it sets the e-mail address, quota and storage of the user upon creation.
     It also completes the account deletion by cleaning other parts of the /e/OS cloud setup to ensure no more data is retained when a user requests an account deletion.
     This app uses the UserDeletedEvent to invoke scripts in the docker-welcome container of /e/OS cloud setup]]></description>
-    <version>8.0.0</version>
+    <version>8.0.1</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 24c5f79574a967db784ba770185bf2fb6e0d5357..788d046ef10e8756b7d3fb5b2468ff40c31b2785 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -33,6 +33,7 @@ use OCA\EcloudAccounts\Listeners\TwoFactorStateChangedListener;
 use OCA\EcloudAccounts\Listeners\UserChangedListener;
 use OCA\EcloudAccounts\Middleware\AccountMiddleware;
 use OCA\EcloudAccounts\Service\LDAPConnectionService;
+use OCA\EcloudAccounts\SetupChecks\EmailRecoveryAppIsEnableCheck;
 use OCA\TwoFactorTOTP\Event\StateChanged;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
@@ -59,6 +60,7 @@ class Application extends App implements IBootstrap {
 		$context->registerEventListener(PasswordUpdatedEvent::class, PasswordUpdatedListener::class);
 	
 		$context->registerMiddleware(AccountMiddleware::class);
+		$context->registerSetupCheck(EmailRecoveryAppIsEnableCheck::class);
 	}
 
 	public function boot(IBootContext $context): void {
diff --git a/lib/SetupChecks/EmailRecoveryAppIsEnableCheck.php b/lib/SetupChecks/EmailRecoveryAppIsEnableCheck.php
new file mode 100644
index 0000000000000000000000000000000000000000..20648a5b8ba9113df3d5d183d76100a2c83a7be3
--- /dev/null
+++ b/lib/SetupChecks/EmailRecoveryAppIsEnableCheck.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\EcloudAccounts\SetupChecks;
+
+use OCP\App\IAppManager;
+use OCP\IL10N;
+use OCP\SetupCheck\ISetupCheck;
+use OCP\SetupCheck\SetupResult;
+
+class EmailRecoveryAppIsEnableCheck implements ISetupCheck {
+	public function __construct(
+		private IL10N       $l10n,
+		private IAppManager $appManager
+	) {
+	}
+
+
+	public function getCategory(): string {
+		return 'app';
+	}
+
+	public function getName(): string {
+		return $this->l10n->t('Email Recovery App Enabled');
+	}
+
+	public function run(): SetupResult {
+		if ($this->appManager->isEnabledForUser('email-recovery')) {
+			return SetupResult::success($this->l10n->t('Email Recovery app is enabled'));
+		}
+
+		return SetupResult::error($this->l10n->t('The Email Recovery app is not enabled, but is required for EcloudAccounts to work.'));
+	}
+}