diff --git a/lib/imap.php b/lib/imap.php
index a88c15c..42c490c 100644
--- a/lib/imap.php
+++ b/lib/imap.php
@@ -61,7 +61,9 @@ public function checkPassword($uid, $password) {
 
 		// Replace escaped splitter in uid
 		// but only if there is no splitter symbol and if there is a escaped splitter inside the uid
-		if (!(strpos($uid, $this->domainSplitter) !== false) && (strpos($uid, $domainSplitterEncoded) !== false)) {
+		if (($this->domainSplitter != $domainSplitterEncoded) 
+				&& !(strpos($uid, $this->domainSplitter) !== false) 
+				&& (strpos($uid, $domainSplitterEncoded) !== false)) {
 			$uid = str_replace($domainSplitterEncoded,$this->domainSplitter,$uid);
 		}