diff --git a/ChangeLog b/ChangeLog
index 12b4c3aa1..53b66a3e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-05-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoFolder.m ([SOGoFolder -defaultUserID]):
+	overriden method to return @"<default>".
+
+	* SoObjects/SOGo/SOGoContentObject.m ([SOGoContentObject
+	-defaultUserID]): overriden method to return @"<default>".
+
 	* SoObjects/Mailer/SOGoMailFolder.m ([SOGoMailFolder
 	-aclsForUser:uid]): overriden method.
 	([SOGoMailFolder -removeAclsForUsers:users]): overriden method.
diff --git a/SoObjects/SOGo/SOGoContentObject.m b/SoObjects/SOGo/SOGoContentObject.m
index 451afdd76..e2b11a44e 100644
--- a/SoObjects/SOGo/SOGoContentObject.m
+++ b/SoObjects/SOGo/SOGoContentObject.m
@@ -343,6 +343,11 @@
                     forObjectAtPath: [self pathArrayToSoObject]];
 }
 
+- (NSString *) defaultUserID
+{
+  return @"<default>";
+}
+
 - (BOOL) hasSupportForDefaultRoles
 {
   return YES;
diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index 2fe7f49e7..82589842c 100644
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -31,6 +31,8 @@
 #import <unistd.h>
 #import <stdlib.h>
 
+static NSString *defaultUserID = @"<default>";
+
 @implementation SOGoFolder
 
 + (int) version
@@ -341,8 +343,8 @@
       [self _cacheRoles: acls forUser: uid forObjectAtPath: objectPath];
     }
 
-  if (!([acls count] || [uid isEqualToString: SOGoDefaultUserID]))
-    acls = [self aclsForUser: SOGoDefaultUserID
+  if (!([acls count] || [uid isEqualToString: defaultUserID]))
+    acls = [self aclsForUser: defaultUserID
 		 forObjectAtPath: objectPathArray];
 
   return acls;
@@ -451,6 +453,11 @@
                forObjectAtPath: [self pathArrayToSoObject]];
 }
 
+- (NSString *) defaultUserID
+{
+  return defaultUserID;
+}
+
 - (BOOL) hasSupportForDefaultRoles
 {
   return YES;