diff --git a/ChangeLog b/ChangeLog
index a66e10574..8aac17655 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-05-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Common/UIxAclEditor.m ([UIxAclEditor -defaultUserID]) 
+	([UIxAclEditor -_prepareUsers]): take the new SOGoObject's
+	"defaultUserID" method into account.
+
 	* UI/Common/UIxUserRightsEditor.m ([UIxUserRightsEditor -userIsDefaultUser]) 
 	([UIxUserRightsEditor -_initRights]): take the new SOGoObject's
 	"defaultUserID" method into account.
diff --git a/UI/Common/UIxAclEditor.h b/UI/Common/UIxAclEditor.h
index 72a34dbaf..f8104ceed 100644
--- a/UI/Common/UIxAclEditor.h
+++ b/UI/Common/UIxAclEditor.h
@@ -33,6 +33,7 @@
   NSArray *savedUIDs;
   NSMutableArray *users;
   NSString *currentUser;
+  NSString *defaultUserID;
 }
 
 - (NSArray *) aclsForObject;
diff --git a/UI/Common/UIxAclEditor.m b/UI/Common/UIxAclEditor.m
index e87a15259..f525b66fd 100644
--- a/UI/Common/UIxAclEditor.m
+++ b/UI/Common/UIxAclEditor.m
@@ -87,7 +87,10 @@
 
 - (NSString *) defaultUserID
 {
-  return SOGoDefaultUserID;
+  if (!defaultUserID)
+    ASSIGN (defaultUserID, [[self clientObject] defaultUserID]);
+
+  return defaultUserID;
 }
 
 - (void) _prepareUsers
@@ -96,16 +99,19 @@
   NSString *currentUID, *ownerLogin;
 
   ownerLogin = [[self clientObject] ownerInContext: context];
+  if (!defaultUserID)
+    ASSIGN (defaultUserID, [[self clientObject] defaultUserID]);
 
   aclsEnum = [[self aclsForObject] objectEnumerator];
   currentUID = [aclsEnum nextObject];
   while (currentUID)
     {
       if (!([currentUID isEqualToString: ownerLogin]
-	    || [currentUID isEqualToString: SOGoDefaultUserID]))
+	    || [currentUID isEqualToString: defaultUserID]))
 	[users addObjectUniquely: currentUID];
       currentUID = [aclsEnum nextObject];
     }
+
   prepared = YES;
 }