diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 8a87147d0..0163c691f 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -249,14 +249,11 @@ static int sizeLimit;
   NSString *currentField;
 
   qs = [NSMutableString string];
+
   fields = [[bindFields componentsSeparatedByString: @","] objectEnumerator];
-  currentField = [fields nextObject];
-  while (currentField)
-    {
-      [qs appendFormat: @"OR (%@='%@')", currentField, uid];
-      currentField = [fields nextObject];
-    }
-  [qs deleteCharactersInRange: NSMakeRange (0, 3)];
+  while ((currentField = [fields nextObject]))
+    [qs appendFormat: @" OR (%@='%@')", currentField, uid];
+  [qs deleteCharactersInRange: NSMakeRange (0, 4)];
 
   return [EOQualifier qualifierWithQualifierFormat: qs];
 }