diff --git a/ChangeLog b/ChangeLog
index 53b66a3e8..717371285 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-05-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoObject.m ([SOGoObject -defaultUserID]): new
+	mandatory method for subclasses. Removed the SOGoDefaultUserID
+	global var.
+
 	* SoObjects/SOGo/SOGoFolder.m ([SOGoFolder -defaultUserID]):
 	overriden method to return @"<default>".
 
diff --git a/SoObjects/SOGo/SOGoObject.h b/SoObjects/SOGo/SOGoObject.h
index 0b2360a6a..a90fdde78 100644
--- a/SoObjects/SOGo/SOGoObject.h
+++ b/SoObjects/SOGo/SOGoObject.h
@@ -52,8 +52,6 @@
 
 #define $(class) NSClassFromString(class)
 
-extern NSString *SOGoDefaultUserID;
-
 @interface SOGoObject : NSObject
 {
   WOContext *context;
@@ -106,6 +104,7 @@ extern NSString *SOGoDefaultUserID;
 - (void) setRoles: (NSArray *) roles
           forUser: (NSString *) uid;
 - (void) removeAclsForUsers: (NSArray *) users;
+- (NSString *) defaultUserID;
 - (BOOL) hasSupportForDefaultRoles;
 
 /* description */
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 6fa6c5328..27ea92d1f 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -47,8 +47,6 @@
 
 #import "SOGoObject.h"
 
-NSString *SOGoDefaultUserID = @"<default>";
-
 @interface SOGoObject(Content)
 - (NSString *)contentAsString;
 @end
@@ -739,6 +737,13 @@ static BOOL kontactGroupDAV = YES;
   [self subclassResponsibility: _cmd];
 }
 
+- (NSString *) defaultUserID
+{
+  [self subclassResponsibility: _cmd];
+
+  return nil;
+}
+
 - (BOOL) hasSupportForDefaultRoles
 {
   return NO;