diff --git a/ChangeLog b/ChangeLog
index 1dda660e6..673042b63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-13  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* SoObjects/SOGo/LDAPSource.m (_qualifierForUIDFilter:): removed
+	duplicated constraints in the filter when using bind fields.
+
 	* UI/WebServerResources/HTMLElement.js (deselectAll): fixed a bug
 	where the properties where not removed from the proper element
 	(table instead of the tbody).
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 8d2722f1d..8844be790 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -593,7 +593,11 @@ static NSArray *commonSearchFields;
     {
       bindFieldsEnum = [bindFields objectEnumerator];
       while ((currentField = [bindFieldsEnum nextObject]))
-        [qs appendFormat: @" OR (%@='%@')", [currentField stringByTrimmingSpaces], escapedUid];
+	{
+	  if ([currentField caseInsensitiveCompare: UIDField] != NSOrderedSame
+	      && ![mailFields containsObject: currentField])
+	    [qs appendFormat: @" OR (%@='%@')", [currentField stringByTrimmingSpaces], escapedUid];
+	}
     }
 
   if (_filter && [_filter length])