diff --git a/ChangeLog b/ChangeLog
index df04bf7f2..bd06c88bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/LDAPUserManager.m ([LDAPUserManager
+	+initialize]): we need to retain the LDAPContactInfoAttribute
+	static var, to avoid a zombie.
+	([LDAPUserManager -fetchContactsMatching:filter])
+	([LDAPUserManager -fetchUsersMatching:filter]): the info attribute
+	is returned if the related entry does NOT contain it yet: the test
+	was reverted.
+
 2008-11-22  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
         * Modified the invitation "update" templates
diff --git a/SoObjects/SOGo/LDAPUserManager.m b/SoObjects/SOGo/LDAPUserManager.m
index 79b3561b3..7bc07bf8a 100644
--- a/SoObjects/SOGo/LDAPUserManager.m
+++ b/SoObjects/SOGo/LDAPUserManager.m
@@ -60,6 +60,7 @@ static BOOL forceImapLoginWithEmail = NO;
 	}
 
       LDAPContactInfoAttribute = [ud stringForKey: @"SOGoLDAPContactInfoAttribute"];
+      [LDAPContactInfoAttribute retain];
     }
   if (!forceImapLoginWithEmail)
     forceImapLoginWithEmail = [ud boolForKey: @"SOGoForceIMAPLoginWithEmail"];
@@ -470,11 +471,10 @@ static BOOL forceImapLoginWithEmail = NO;
   NSDictionary *userEntry;
   NSArray *newContacts;
   NSMutableArray *emails;
-  NSString *uid, *email;
+  NSString *uid, *email, *infoAttribute;
 
   compactContacts = [NSMutableDictionary dictionary];
-  userEntry = [contacts nextObject];
-  while (userEntry)
+  while ((userEntry = [contacts nextObject]))
     {
       uid = [userEntry objectForKey: @"c_uid"];
       if ([uid length])
@@ -507,14 +507,17 @@ static BOOL forceImapLoginWithEmail = NO;
 	  email = [userEntry objectForKey: @"xmozillasecondemail"];
 	  if (email && ![emails containsObject: email])
 	    [emails addObject: email];
-	  if ([LDAPContactInfoAttribute length] > 0 &&
-	      [[returnContact objectForKey: LDAPContactInfoAttribute] length] > 0 &&
-	      [userEntry objectForKey: LDAPContactInfoAttribute] != nil)
-	    [returnContact setObject: [userEntry objectForKey: LDAPContactInfoAttribute]
+	  if ([LDAPContactInfoAttribute length]
+	      && ![[returnContact
+		     objectForKey: LDAPContactInfoAttribute] length])
+	    {
+	      infoAttribute
+		= [userEntry objectForKey: LDAPContactInfoAttribute];
+	      if ([infoAttribute length])
+		[returnContact setObject: infoAttribute
 			   forKey: LDAPContactInfoAttribute];
+	    }
 	}
-
-      userEntry = [contacts nextObject];
     }
   newContacts = [compactContacts allValues];
   [self _fillContactsMailRecords: [newContacts objectEnumerator]];