diff --git a/ChangeLog b/ChangeLog
index beab4b641..3b291afda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder
+	-davUserQuery:queryContext]): make searches only in user
+	repositories and not in addressbooks.
+
 2008-07-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Scheduler/UIxCalMonthView.m ([UIxCalMonthView
diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m
index 252c6ac65..0b90f4c0d 100644
--- a/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SoObjects/SOGo/SOGoUserFolder.m
@@ -28,6 +28,7 @@
 #import <NGObjWeb/SoClassSecurityInfo.h>
 #import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 
 #import <NGExtensions/NSObject+Logs.h>
@@ -315,8 +316,9 @@
   NSString *field;
 
   fetch = [NSMutableString string];
+
   um = [LDAPUserManager sharedUserManager];
-  users = [[um fetchContactsMatching: user] objectEnumerator];
+  users = [[um fetchUsersMatching: user] objectEnumerator];
   while ((currentUser = [users nextObject]))
     {
       [fetch appendString: @"<user>"];