diff --git a/ChangeLog b/ChangeLog
index 89689825a..b8f911012 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/LDAPSource.m ([LDAPSource
+	-setBaseDN:newBaseDNIDField:newIDFieldCNField:newCNFieldUIDField:newUIDFieldmailFields:newMailFieldsandBindFields:newBindFields]):
+	bug setting the CN and UID field only if they were set before,
+	rather than checking their value passed as parameter.
+
 2009-03-13  Ludovic Marcotte <lmarcotte@inverse.ca>
 
         * Optimized the IMAP client code to avoid
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 173f26829..97c185c79 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -233,9 +233,9 @@ static NSLock *lock;
   ASSIGN (baseDN, newBaseDN);
   if (newIDField)
     ASSIGN (IDField, newIDField);
-  if (CNField)
+  if (newCNField)
     ASSIGN (CNField, newCNField);
-  if (UIDField)
+  if (newUIDField)
     ASSIGN (UIDField, newUIDField);
   if (newMailFields)
     ASSIGN (mailFields, newMailFields);