diff --git a/ChangeLog b/ChangeLog
index 84c49f0ae..814019819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-15  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/SOGo/SOGoUser.m (-initWithLogin:roles:trust:): when
+	the login contains a @ character, compare the right part with only the
+	defined login domains (SOGoLoginDomains) -- don't consider all domains.
+
 2011-07-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/*.m: make use of mapistore error code rather than
diff --git a/Documentation/SOGo Installation Guide.odt b/Documentation/SOGo Installation Guide.odt
index 0fa202703..75360e001 100644
Binary files a/Documentation/SOGo Installation Guide.odt and b/Documentation/SOGo Installation Guide.odt differ
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index a58afc1e3..42de92e95 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -156,10 +156,10 @@
       if (r.location != NSNotFound)
         {
           // The domain is probably appended to the username;
-          // make sure it is a defined domain in the configuration.
+          // make sure it is defined as a login domain in the configuration.
           sd = [SOGoSystemDefaults sharedSystemDefaults];
           domain = [newLogin substringFromIndex: (r.location + r.length)];
-          if ([[sd domainIds] containsObject: domain])
+          if ([[sd loginDomains] containsObject: domain])
             newLogin = [newLogin substringToIndex: r.location];
           else
             domain = nil;