diff --git a/SoObjects/SOGo/SOGoWebAuthenticator.m b/SoObjects/SOGo/SOGoWebAuthenticator.m
index bb35f2789..639ca4ec0 100644
--- a/SoObjects/SOGo/SOGoWebAuthenticator.m
+++ b/SoObjects/SOGo/SOGoWebAuthenticator.m
@@ -257,7 +257,7 @@
                   grace: &grace])
     return nil;
   
-  if (domain)
+  if (domain && [login rangeOfString: @"@"].location == NSNotFound)
     login = [NSString stringWithFormat: @"%@@%@", login, domain];
 
   return login;