diff --git a/SoObjects/Appointments/product.plist b/SoObjects/Appointments/product.plist
index 1fb47e4d7..d70b2faad 100644
--- a/SoObjects/Appointments/product.plist
+++ b/SoObjects/Appointments/product.plist
@@ -11,7 +11,7 @@
     SOGoAppointmentFolder = {
       superclass = "SOGoFolder";
       defaultRoles = {
-        "FreeBusyLookup" = ( "Owner", "FreeBusy", "AuthorizedSubscriber" );
+/*        "FreeBusyLookup" = ( "Owner", "FreeBusy", "AuthorizedSubscriber" );  */
 	"ViewWholePublicRecords" = ( "Owner", "PublicResponder", "PublicModifier", "PublicViewer" );
 	"ViewDAndTOfPublicRecords" = ( "Owner", "PublicDAndTViewer" );
 	"ModifyPublicRecords" = ( "Owner", "PublicModifier" );
@@ -29,7 +29,7 @@
       };
     };
     SOGoGroupAppointmentFolder = {
-      superclass    = "SOGoAppointmentFolder";
+      superclass = "SOGoAppointmentFolder";
     };
     SOGoCalendarComponent = {
       superclass = "SOGoContentObject";
@@ -42,14 +42,18 @@
       };
     };
     SOGoAppointmentObject = {
-      superclass    = "SOGoCalendarComponent";
+      superclass = "SOGoCalendarComponent";
     };
     SOGoTaskObject = {
       superclass    = "SOGoCalendarComponent";
     };
     SOGoFreeBusyObject = {
-      superclass    = "SOGoContentObject";
-      protectedBy = "<public>";
+      superclass = "SOGoContentObject";
+      protectedBy = "Access Contents Information";
+      defaultRoles = {
+	"Access Contents Information" = ( "Owner", "Authenticated" );
+        "WebDAV Access" = ( "Owner", "Authenticated" );
+      };
     };
   };
 }
diff --git a/SoObjects/SOGo/SOGoAuthenticator.m b/SoObjects/SOGo/SOGoAuthenticator.m
index fa7cad377..fa9a0526d 100644
--- a/SoObjects/SOGo/SOGoAuthenticator.m
+++ b/SoObjects/SOGo/SOGoAuthenticator.m
@@ -77,9 +77,9 @@
   else
     accept = ([_login length] > 0);
 
-  return (accept
-	  || ([_login isEqualToString: @"freebusy"]
-	      && [_pwd isEqualToString: @"freebusy"]));
+  return accept;
+// 	  || ([_login isEqualToString: @"freebusy"]
+// 	      && [_pwd isEqualToString: @"freebusy"]));
 }
 
 - (NSString *) _passwordInContext: (WOContext *) context
@@ -103,7 +103,7 @@
 
 - (SOGoUser *) userInContext: (WOContext *)_ctx
 {
-  static SOGoUser *anonymous = nil, *freebusy;
+  static SOGoUser *anonymous = nil;
   SOGoUser *user;
   NSArray *traversalPath;
   NSString *login;
@@ -112,10 +112,10 @@
     anonymous
       = [[SOGoUser alloc] initWithLogin: @"anonymous"
 			  roles: [NSArray arrayWithObject: SoRole_Anonymous]];
-  if (!freebusy)
-    freebusy
-      = [[SOGoUser alloc] initWithLogin: @"freebusy"
-                          roles: [NSArray arrayWithObject: SOGoRole_FreeBusy]];
+//   if (!freebusy)
+//     freebusy
+//       = [[SOGoUser alloc] initWithLogin: @"freebusy"
+//                           roles: [NSArray arrayWithObject: SOGoRole_FreeBusy]];
 
   login = [self checkCredentialsInContext:_ctx];
   if (login)
@@ -123,10 +123,10 @@
       if ([login isEqualToString: @"anonymous"])
         {
           traversalPath = [_ctx objectForKey: @"SoRequestTraversalPath"];
-          if ([[traversalPath lastObject] isEqualToString: @"freebusy.ifb"])
-            user = freebusy;
-          else
-            user = anonymous;
+//           if ([[traversalPath lastObject] isEqualToString: @"freebusy.ifb"])
+//             user = freebusy;
+//           else
+	  user = anonymous;
         }
       else
 	{
diff --git a/UI/MainUI/product.plist b/UI/MainUI/product.plist
index ed1eaaed7..c751208bb 100644
--- a/UI/MainUI/product.plist
+++ b/UI/MainUI/product.plist
@@ -12,7 +12,7 @@
       superclass  = "SoComponent";
       protectedBy = "View";
       defaultRoles = {
-        "View" = ( "Authenticated", "FreeBusy" );
+        "View" = ( "Authenticated" );
       };
     };
     SOGoObject = {