diff --git a/Dockerfile b/Dockerfile
index 5bc0506cdbd1d8d23ba18ba86d2bbffdd358a627..5cd2a66cff3219c0a8a53b1bf96838ea3465f77b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ ARG EA_TAG="1.1.0"
 ARG ECLOUD_LAUNCHER_JOB_ID="222001"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.6"
 
-RUN sed -i 's/21,0,9,1/21,0,9,9/' ${BASE_DIR}/version.php
+RUN sed -i 's/21,0,9,1/21,0,9,11/' ${BASE_DIR}/version.php
 
 # Install unzip for unzipping artifacts
 RUN apt-get update && apt-get install unzip 
@@ -97,7 +97,7 @@ RUN sed -i "s/\$systemConfig->setValue('theme', '');/\$systemConfig->setValue('t
 
 # Patches
 COPY patches/ ${TMP_PATCH_DIR}/
-RUN patch -u ${BASE_DIR}/core/Controller/LoginController.php -i ${TMP_PATCH_DIR}/002-login-without-domain.patch
+RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/002-login-without-domain.patch
 RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch
 RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PATCH_DIR}/004-contact-search-controller-removal.patch
 RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch
diff --git a/patches/002-login-without-domain.patch b/patches/002-login-without-domain.patch
index 6e6706286120b34c1605ae32aa7756ef61e0956a..fb91e4aeec52c81db200027b0c1b956e2f147d35 100644
--- a/patches/002-login-without-domain.patch
+++ b/patches/002-login-without-domain.patch
@@ -7,21 +7,54 @@ This patch auto append the domain handled by nc, configured in env var.
 only the admin user (also configured in env var) will not have his login appended with a @domain suffix
 
 diff --git files/LoginController.php files/LoginController-new.php
---- files/LoginController.php	2021-02-04 11:20:48.000000000 +0100
-+++ files/LoginController-new.php	2021-02-04 11:24:27.000000000 +0100
-@@ -299,6 +299,15 @@
+--- ./core/Controller/LoginController.php 2022-04-22 12:31:59.886885713 +0530
++++ ./core/Controller/LoginController-new.php 2022-04-22 12:45:10.995439187 +0530
+@@ -299,6 +299,23 @@
  			return $this->generateRedirect($redirect_url);
  		}
  
 +		$user = trim($user);
 +		$user = mb_strtolower($user, 'UTF-8');
-+		$domain = $this->config->getSystemValue("mail_domain");
-+		$domain_suffix = "@$domain";
++		$domain = $this->config->getSystemValue('mail_domain', '');
++		$domain_suffix = !empty($domain) ? '@' . $domain : '';
++		$alt_domain = $this->config->getSystemValue('alt_mail_domain', '');
++		$alt_domain_suffix = !empty($alt_domain) ? '@'  . $alt_domain : '';
 +		$admin_username = $_ENV["NEXTCLOUD_ADMIN_USER"];
-+		if (stristr($user, $domain_suffix) === FALSE && strcmp($user, $admin_username) != 0) {
-+			$user = $user . $domain_suffix;
++		$is_admin = strcmp($user, $admin_username) === 0;
++
++		if(!$is_admin) {
++				$user = str_replace($alt_domain_suffix, $domain_suffix, $user);
++		}
++
++		if (!$is_admin && stristr($user, $domain_suffix) === FALSE) {
++				$user = $user . $domain_suffix;
 +		}
 +
  		$data = new LoginData(
  			$this->request,
  			trim($user),
+--- ./core/Controller/WebAuthnController.php	2022-04-22 15:05:36.640254016 +0530
++++ ./core/Controller/WebAuthnController-new.php	2022-04-22 15:06:27.590436349 +0530
+@@ -74,6 +74,22 @@
+ 
+ 		$this->logger->debug('Converting login name to UID');
+ 		$uid = $loginName;
++		$uid = trim($uid);
++		$uid = mb_strtolower($uid, 'UTF-8');
++		$domain = \OC::$server->getConfig()->getSystemValue('mail_domain', '');
++		$domain_suffix = !empty($domain) ? '@' . $domain : '';
++		$alt_domain = \OC::$server->getConfig()->getSystemValue('alt_mail_domain', '');
++		$alt_domain_suffix = !empty($alt_domain) ? '@'  . $alt_domain : '';
++		$admin_username = $_ENV["NEXTCLOUD_ADMIN_USER"];
++		$is_admin = strcmp($uid, $admin_username) === 0;
++
++		if(!$is_admin) {
++						$uid = str_replace($alt_domain_suffix, $domain_suffix, $uid);
++		}
++
++		if (!$is_admin && stristr($uid, $domain_suffix) === FALSE) {
++						$uid = $uid . $domain_suffix;
++		}
+ 		Util::emitHook(
+ 			'\OCA\Files_Sharing\API\Server2Server',
+ 			'preLoginNameUsedAsUserName',
diff --git a/patches/006-recovery-email-changes.patch b/patches/006-recovery-email-changes.patch
index adc5377e577ae173f41f6c47e8ccf87ba76163ea..607524ac5dce508618873325ef8541e1cb262090 100644
--- a/patches/006-recovery-email-changes.patch
+++ b/patches/006-recovery-email-changes.patch
@@ -5,15 +5,18 @@ Subject: [PATCH] Makes password reset links use recovery email set through "emai
 This patch adds the necessary changes to core NC controller and template for "email-recovery" app to work correctly. Instead of the user's email address, the user's recovery email address set through the "email-recovery" app is used for the password reset email. Further the user's "email" in the template(so that users cannot edit it).
 
 diff --git ./core/Controller/LostController.php ./core/Controller/LostController.new.php
---- ./core/Controller/LostController.php	2021-03-26 09:51:09.317785801 +0530
-+++ ./core/Controller/LostController.new.php	2021-03-26 09:51:35.490073707 +0530
-@@ -194,6 +194,13 @@
+--- ./core/Controller/LostController.php	2022-04-22 13:12:21.012446926 +0530
++++ ./core/Controller/LostController.new.php	2022-04-22 13:19:46.217355408 +0530
+@@ -194,6 +194,16 @@
  	 * @throws \Exception
  	 */
  	protected function checkPasswordResetToken($token, $userId) {
-+		$domain = $this->config->getSystemValue("mail_domain");
-+		$domainSuffix = "@$domain";
-+
++		$domain = $this->config->getSystemValue('mail_domain', '');
++		$domainSuffix = !empty($domain) ? '@' . $domain : '';
++		$altDomain = $this->config->getSystemValue('alt_mail_domain', '');
++		$altDomainSuffix = !empty($altDomain) ? '@' . $altDomain : '';
++		
++		$userId = str_replace($altDomainSuffix, $domainSuffix, $userId);
 +		if(stristr($userId, $domainSuffix) === FALSE ) {
 +			$userId = $userId . $domainSuffix;
 +		}
@@ -21,7 +24,7 @@ diff --git ./core/Controller/LostController.php ./core/Controller/LostController
  		$user = $this->userManager->get($userId);
  		if ($user === null || !$user->isEnabled()) {
  			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
-@@ -205,8 +212,9 @@
+@@ -205,8 +215,9 @@
  		}
  
  		try {
@@ -33,13 +36,16 @@ diff --git ./core/Controller/LostController.php ./core/Controller/LostController
  		} catch (\Exception $e) {
  			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
  		}
-@@ -333,8 +341,15 @@
+@@ -333,8 +344,18 @@
  	 * @throws \OCP\PreConditionNotMetException
  	 */
  	protected function sendEmail($input) {
-+		$domain = $this->config->getSystemValue("mail_domain");
-+		$domainSuffix = "@$domain";
-+
++		$domain = $this->config->getSystemValue('mail_domain', '');
++		$domainSuffix = !empty($domain) ? '@' . $domain : '';
++		$altDomain = $this->config->getSystemValue('alt_mail_domain', '');
++		$altDomainSuffix = !empty($altDomain) ? '@' . $altDomain : '';
++		
++		$input = str_replace($altDomainSuffix, $domainSuffix, $input);
 +		if(stristr($input, $domainSuffix) === FALSE ) {
 +			$input = $input . $domainSuffix;
 +		}