diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
index 5cc4a2fa7..fe13302cc 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
@@ -108,16 +108,16 @@ class Domain implements \JsonSerializable
 	{
 		$sW = \trim($this->whiteList);
 		if ($sW) {
-			$sEmail = $this->IMAP->fixUsername($sEmail);
+			$sEmail = $this->IMAP->fixUsername($sEmail, false);
 			$sLogin = $this->IMAP->fixUsername($sLogin);
 			$sUserPart = \MailSo\Base\Utils::getEmailAddressLocalPart($sLogin ?: $sEmail);
+			$sUserDomain = \MailSo\Base\Utils::getEmailAddressDomain($sEmail);
 			$sItem = \strtok($sW, " ;,\n");
 			while (false !== $sItem) {
-				$sItem = $this->IMAP->fixUsername(\trim($sItem));
-				if ($sItem && (
-					$sLogin === $sItem || $sEmail === $sItem
-					|| $sUserPart === $sItem || \str_starts_with($sItem, "{$sUserPart}@")
-				)) {
+				$sItem = $this->IMAP->fixUsername(\trim($sItem), false);
+				if ($sLogin === $sItem || $sEmail === $sItem
+				  || $sUserPart === $sItem || "@{$sUserDomain}" === $sItem
+				) {
 					return true;
 				}
 				$sItem = \strtok(" ;,\n");
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index fc0628295..58dedf652 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -287,7 +287,7 @@
 			<label for="tab-whitelist" role="tab" tabindex="0" data-icon="👥" data-i18n="POPUPS_DOMAIN/BUTTON_WHITE_LIST"></label>
 			<div class="tab-content" role="tabpanel" aria-hidden="true">
 				<div class="alert" data-i18n="POPUPS_DOMAIN/WHITE_LIST_ALERT"></div>
-				<textarea class="input-xxlarge" style="width: 100%" rows="8" data-bind="value: whiteList" tabindex="-1"></textarea>
+				<textarea class="input-xxlarge" style="width: 100%" rows="8" data-bind="value: whiteList" tabindex="-1" placeholder="@example.com&#10;user@example.org&#10;username"></textarea>
 			</div>
 		</div>
 	</div>