diff --git a/ChangeLog b/ChangeLog
index 75e6f0ec3..de4830570 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/LDAPUserManager.m ([LDAPUserManager
+	-contactInfosForUserWithUIDorEmail:uid]): only use the
+	authentication sources.
+
 2008-08-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoComponentOccurence.m
diff --git a/SoObjects/SOGo/LDAPUserManager.m b/SoObjects/SOGo/LDAPUserManager.m
index e19cce700..3679e0f67 100644
--- a/SoObjects/SOGo/LDAPUserManager.m
+++ b/SoObjects/SOGo/LDAPUserManager.m
@@ -323,7 +323,7 @@ static BOOL forceImapLoginWithEmail = NO;
   NSDictionary *userEntry;
   NSEnumerator *ldapSources;
   LDAPSource *currentSource;
-  NSString *cn, *c_uid;
+  NSString *sourceID, *cn, *c_uid;
   NSArray *c_emails;
   BOOL access;
 
@@ -336,9 +336,10 @@ static BOOL forceImapLoginWithEmail = NO;
   [currentUser setObject: [NSNumber numberWithBool: YES]
 	       forKey: @"MailAccess"];
 
-  ldapSources = [sources objectEnumerator];
-  while ((currentSource = [ldapSources nextObject]))
+  ldapSources = [[self authenticationSourceIDs] objectEnumerator];
+  while ((sourceID = [ldapSources nextObject]))
     {
+      currentSource = [sources objectForKey: sourceID];
       userEntry = [currentSource lookupContactEntryWithUIDorEmail: uid];
       if (userEntry)
 	{