diff --git a/ChangeLog b/ChangeLog
index 4f3c6f7f0..321cf02ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
 	coming from a SQL database. This can be used concurrently
 	with LDAP sources. Modified many classes to reflect this
 	change.
+	* SoObjects/SOGo/LDAPSource.m 
+	We trim the bind field value prior to adding it to our
+	LDAP search filter.
 
 2009-09-24  Cyril Robert <crobert@inverse.ca>
 
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 697b55d39..d96ce92e8 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -490,7 +490,7 @@ static NSLock *lock;
       bindFieldsEnum = [[bindFields componentsSeparatedByString: @","]
                          objectEnumerator];
       while ((currentField = [bindFieldsEnum nextObject]))
-        [qs appendFormat: @" OR (%@='%@')", currentField, escapedUid];
+        [qs appendFormat: @" OR (%@='%@')", [currentField stringByTrimmingSpaces], escapedUid];
     }
 
   if (_filter && [_filter length])