--- a/Main/SOGo.m	2011-01-27 23:42:30.000000000 +0530
+++ b/Main/SOGo.m	2011-03-21 18:43:43.000000000 +0530
@@ -273,8 +273,10 @@
 - (id) authenticatorInContext: (WOContext *) context
 {
   id authenticator;
+  NSString *remoteUser;
 
-  if (trustProxyAuthentication)
+  remoteUser = [[context request] headerForKey: @"x-webobjects-remote-user"];
+  if (trustProxyAuthentication && remoteUser)
     authenticator = [SOGoProxyAuthenticator sharedSOGoProxyAuthenticator];
   else
     {