diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 91d3b1b5a..c1b0f7603 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -197,8 +197,12 @@
           // When the user is associated to a domain, the [SOGoUser login]
           // method returns the combination login@domain while
           // [SOGoUser loginInDomain] only returns the login.
-          uid = [NSString stringWithString: realUID];
-          realUID = [NSString stringWithFormat: @"%@@%@", realUID, domain];
+          r = [realUID rangeOfString: domain  options: NSBackwardsSearch|NSCaseInsensitiveSearch];
+
+          if (r.location != NSNotFound)
+            uid = [realUID substringToIndex: r.location-1];
+          else
+            uid = [NSString stringWithString: realUID];
         }
     }