diff --git a/ChangeLog b/ChangeLog
index 42bc66729..331f0414f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-03-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoAuthenticator.m ([SOGoAuthenticator
+	-userInContext:]): returns "SOGoUser".
+
 	* SoObjects/Appointments/SOGoCalendarComponent.m
 	([SOGoCalendarComponent -contentAsString]): overriden method that
 	takes the privacy into account and discard the relevant fields if
diff --git a/SoObjects/SOGo/SOGoAuthenticator.h b/SoObjects/SOGo/SOGoAuthenticator.h
index 1a5549e53..a56ac4267 100644
--- a/SoObjects/SOGo/SOGoAuthenticator.h
+++ b/SoObjects/SOGo/SOGoAuthenticator.h
@@ -34,6 +34,8 @@
 @class NSUserDefaults;
 @class NSString;
 
+@class SOGoUser;
+
 @interface SOGoAuthenticator : SoHTTPAuthenticator
 {
   NSUserDefaults *ud;
@@ -47,6 +49,8 @@
 
 - (BOOL) LDAPCheckLogin: (NSString *) _login password: (NSString *) _pwd;
 
+- (SOGoUser *) userInContext: (WOContext *) _ctx;
+
 @end
 
 #endif /* __Main_SOGoAuthenticator_H__ */
diff --git a/SoObjects/SOGo/SOGoAuthenticator.m b/SoObjects/SOGo/SOGoAuthenticator.m
index 18c00d272..2c276e06b 100644
--- a/SoObjects/SOGo/SOGoAuthenticator.m
+++ b/SoObjects/SOGo/SOGoAuthenticator.m
@@ -96,9 +96,9 @@ static SOGoAuthenticator *auth = nil;
 
 /* create SOGoUser */
 
-- (SoUser *) userInContext:(WOContext *)_ctx
+- (SOGoUser *) userInContext: (WOContext *)_ctx
 {
-  static SoUser *anonymous = nil, *freebusy;
+  static SOGoUser *anonymous = nil, *freebusy;
   SoUser *user;
   NSArray *traversalPath;
   NSString *login;