diff --git a/ChangeLog b/ChangeLog
index 70b1607fa..73d7ac1ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2010-01-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoWebAuthenticator.h: conforms to
+	SOGoAuthenticator protocol.
+
+	* SoObjects/SOGo/SOGoDAVAuthenticator.h: conforms to
+	SOGoAuthenticator protocol.
+
+	* SoObjects/SOGo/SOGoProxyAuthenticator.m
+	(-imapPasswordInContext:forServer:forceRenew:): added method.
+	Returns nil when renew is set to YES so that no real retry occurs
+	(convention: null password is NO password) but returns an empty
+	string by default.
+
 	* SoObjects/SOGo/SOGoUserFolder.m (-ownerInContext:): invoke
 	setOwner: to retain user.
 
diff --git a/SoObjects/SOGo/SOGoDAVAuthenticator.h b/SoObjects/SOGo/SOGoDAVAuthenticator.h
index 37e0becff..0691cb2bf 100644
--- a/SoObjects/SOGo/SOGoDAVAuthenticator.h
+++ b/SoObjects/SOGo/SOGoDAVAuthenticator.h
@@ -42,9 +42,6 @@
 
 + (id) sharedSOGoDAVAuthenticator;
 
-- (SOGoUser *) userInContext: (WOContext *) _ctx;
-- (NSString *) passwordInContext: (WOContext *) context;
-
 @end
 
 #endif /* _SOGoDAVAuthenticator_H__ */
diff --git a/SoObjects/SOGo/SOGoProxyAuthenticator.h b/SoObjects/SOGo/SOGoProxyAuthenticator.h
index 8bbc73a86..d32ac5e9a 100644
--- a/SoObjects/SOGo/SOGoProxyAuthenticator.h
+++ b/SoObjects/SOGo/SOGoProxyAuthenticator.h
@@ -41,13 +41,10 @@
 @class SOGoUser;
 
 // @interface SOGoProxyAuthenticator : SoHTTPAuthenticator <SOGoAuthenticator>
-@interface SOGoProxyAuthenticator : NSObject
+@interface SOGoProxyAuthenticator : NSObject <SOGoAuthenticator>
 
 + (id) sharedSOGoProxyAuthenticator;
 
-- (SOGoUser *) userInContext: (WOContext *) _ctx;
-- (NSString *) passwordInContext: (WOContext *) context;
-
 @end
 
 #endif /* _SOGoProxyAuthenticator_H__ */
diff --git a/SoObjects/SOGo/SOGoProxyAuthenticator.m b/SoObjects/SOGo/SOGoProxyAuthenticator.m
index 447ee340e..a3c50c3bb 100644
--- a/SoObjects/SOGo/SOGoProxyAuthenticator.m
+++ b/SoObjects/SOGo/SOGoProxyAuthenticator.m
@@ -103,6 +103,13 @@
   return @"";
 }
 
+- (NSString *) imapPasswordInContext: (WOContext *) context
+                           forServer: (NSString *) imapServer
+                          forceRenew: (BOOL) renew
+{
+  return (renew ? nil : @"");
+}
+
 - (WOResponse *) preprocessCredentialsInContext: (WOContext *) context
 {
   WOResponse *r;
diff --git a/SoObjects/SOGo/SOGoWebAuthenticator.h b/SoObjects/SOGo/SOGoWebAuthenticator.h
index 84f476ea1..12a295c1c 100644
--- a/SoObjects/SOGo/SOGoWebAuthenticator.h
+++ b/SoObjects/SOGo/SOGoWebAuthenticator.h
@@ -30,7 +30,7 @@
 
 @class SOGoUser;
 
-@interface SOGoWebAuthenticator : SoCookieAuthenticator
+@interface SOGoWebAuthenticator : SoCookieAuthenticator <SOGoAuthenticator>
 
 + (id) sharedSOGoWebAuthenticator;