diff --git a/ChangeLog b/ChangeLog
index 4cf81ee3e..10d2f7a77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-01-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoAuthenticator.m ([SOGoAuthenticator
+	-checkLogin:_loginpassword:_pwd]): authorize special "freebusy"
+	user with password "freebusy".
+
 	* SoObjects/Appointments/SOGoFreeBusyObject.m ([SOGoFreeBusyObject
 	-contentAsString]): the default timerange is now 14 days before
 	currentday and 1 month after.
diff --git a/SoObjects/SOGo/SOGoAuthenticator.m b/SoObjects/SOGo/SOGoAuthenticator.m
index 00205e6fd..0aa6552e5 100644
--- a/SoObjects/SOGo/SOGoAuthenticator.m
+++ b/SoObjects/SOGo/SOGoAuthenticator.m
@@ -72,20 +72,11 @@ static SOGoAuthenticator *auth = nil;
 - (BOOL) checkLogin: (NSString *) _login
 	   password: (NSString *) _pwd
 {
-  BOOL result;
-
-//   return YES;
-  if ([authMethod isEqualToString: @"LDAP"])
-    result = [self LDAPCheckLogin: _login password: _pwd];
-  else
-    {
-      if ([_login length] == 0)
-	result = NO;
-      else
-	result = YES;
-    }
-
-  return result;
+  return (([_login isEqualToString: @"freebusy"]
+           && [_pwd isEqualToString: @"freebusy"])
+          || ([authMethod isEqualToString: @"LDAP"]
+              && [self LDAPCheckLogin: _login password: _pwd])
+          || [_login length] > 0);
 }
 
 - (BOOL) LDAPCheckLogin: (NSString *) _login