diff --git a/ChangeLog b/ChangeLog
index b053aa93c..efb9ae8ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/LDAPSource.m (-allEntryIDs): take the _filter
+	ivar into account.
+
 2012-03-27  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Contacts/SOGoContactFolders.m
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index b5cbc146a..3269ca10c 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -830,6 +830,8 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField
   NSEnumerator *entries;
   NGLdapEntry *currentEntry;
   NGLdapConnection *ldapConnection;
+  EOQualifier *qualifier;
+  NSMutableString *qs;
   NSString *value;
   NSArray *attributes;
   NSMutableArray *ids;
@@ -838,17 +840,23 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField
 
   ldapConnection = [self _ldapConnection];
   attributes = [NSArray arrayWithObject: IDField];
+
+  qs = [NSMutableString stringWithFormat: @"(%@='*')", CNField];
+  if ([_filter length])
+    [qs appendFormat: @" AND %@", _filter];
+  qualifier = [EOQualifier qualifierWithQualifierFormat: qs];
+
   if ([_scope caseInsensitiveCompare: @"BASE"] == NSOrderedSame) 
     entries = [ldapConnection baseSearchAtBaseDN: baseDN
-                                       qualifier: nil
+                                       qualifier: qualifier
                                       attributes: attributes];
   else if ([_scope caseInsensitiveCompare: @"ONE"] == NSOrderedSame) 
     entries = [ldapConnection flatSearchAtBaseDN: baseDN
-                                       qualifier: nil
+                                       qualifier: qualifier
                                       attributes: attributes];
   else
     entries = [ldapConnection deepSearchAtBaseDN: baseDN
-                                       qualifier: nil
+                                       qualifier: qualifier
                                       attributes: attributes];
 
   while ((currentEntry = [entries nextObject]))