diff --git a/appinfo/info.xml b/appinfo/info.xml
index 35a9b216ad75861c84ebdedff327b494c024ec54..88fad061aa888b773b799e6b67509ed21bd41861 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.3</version>
+    <version>8.0.4</version>
     <licence>agpl</licence>
     <author mail="dev@murena.com" homepage="https://murena.com/">Murena SAS</author>
     <namespace>EcloudAccounts</namespace>
diff --git a/lib/Service/SSOService.php b/lib/Service/SSOService.php
index 896b2d20023b2bc10ed376cf37db5252cacd2f6b..a6cb4d23848ec02282a76c8ded73d9b672f4caaf 100644
--- a/lib/Service/SSOService.php
+++ b/lib/Service/SSOService.php
@@ -8,6 +8,7 @@ use OCA\EcloudAccounts\Exception\SSOAdminAccessTokenException;
 use OCA\EcloudAccounts\Exception\SSOAdminAPIException;
 use OCP\IConfig;
 use OCP\ILogger;
+use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\Security\ICrypto;
 
@@ -21,12 +22,13 @@ class SSOService {
 	private string $currentUserId;
 	private ICrypto $crypto;
 	private IFactory $l10nFactory;
+	private IUserManager $userManager;
 
 	private const ADMIN_TOKEN_ENDPOINT = '/auth/realms/master/protocol/openid-connect/token';
 	private const USERS_ENDPOINT = '/users';
 	private const CREDENTIALS_ENDPOINT = '/users/{USER_ID}/credentials';
 
-	public function __construct($appName, IConfig $config, CurlService $curlService, ICrypto $crypto, IFactory $l10nFactory, ILogger $logger) {
+	public function __construct($appName, IConfig $config, CurlService $curlService, ICrypto $crypto, IFactory $l10nFactory, IUserManager $userManager, ILogger $logger) {
 		$this->appName = $appName;
 		$this->config = $config;
 
@@ -45,6 +47,7 @@ class SSOService {
 		$this->curl = $curlService;
 		$this->logger = $logger;
 		$this->l10nFactory = $l10nFactory;
+		$this->userManager = $userManager;
 	}
 
 	public function shouldSync2FA() : bool {
@@ -147,8 +150,16 @@ class SSOService {
 	}
 
 	private function getUserId(string $username) : void {
-		$usernameWithoutDomain = explode('@', $username)[0];
-		$url = $this->ssoConfig['admin_rest_api_url'] . self::USERS_ENDPOINT . '?exact=true&username=' . $usernameWithoutDomain;
+		$user = $this->userManager->get($username);
+		if ($user === null) {
+			throw new SSOAdminAPIException('Error: no user exists in cloud with username ' . $username);
+		}
+		$email = $user->getEMailAddress();
+		if ($email === null) {
+			throw new SSOAdminAPIException('Error: user with username ' . $username . ' does not have email field set');
+		}
+
+		$url = $this->ssoConfig['admin_rest_api_url'] . self::USERS_ENDPOINT . '?exact=true&email=' . $email;
 		$this->logger->debug('getUserId calling SSO API with url: '. $url);
 		$users = $this->callSSOAPI($url, 'GET');
 		if (empty($users) || !is_array($users) || !isset($users[0])) {