diff --git a/ChangeLog b/ChangeLog
index 83e939081..82b636751 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-10-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoWebAuthenticator.m ([SOGoWebAuthenticator
+	-userInContext:]): override the super method by returning
+	anonymous if the super returns nil.
+
 	* UI/Common/UIxPageFrame.m ([UIxPageFrame
 	-productLocalizableStrings]): new method that returns the
 	product-specific translation dictionary as a JSON hash.
diff --git a/SoObjects/SOGo/SOGoWebAuthenticator.m b/SoObjects/SOGo/SOGoWebAuthenticator.m
index 36a962826..68c802592 100644
--- a/SoObjects/SOGo/SOGoWebAuthenticator.m
+++ b/SoObjects/SOGo/SOGoWebAuthenticator.m
@@ -92,6 +92,23 @@
 // 	      && [_pwd isEqualToString: @"freebusy"]));
 }
 
+- (SOGoUser *) userInContext: (WOContext *)_ctx
+{
+  static SOGoUser *anonymous = nil;
+  SOGoUser *user;
+
+  if (!anonymous)
+    anonymous
+      = [[SOGoUser alloc] initWithLogin: @"anonymous"
+			  roles: [NSArray arrayWithObject: SoRole_Anonymous]];
+
+  user = (SOGoUser *) [super userInContext: _ctx];
+  if (!user)
+    user = anonymous;
+
+  return user;
+}
+
 - (NSString *) passwordInContext: (WOContext *) context
 {
   NSArray *creds;