diff --git a/ChangeLog b/ChangeLog
index 5a5eb0713..876da1002 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-14  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Scheduler/UIxComponentEditor.m (-getEventRWType): the user
+	is not an attendee when dealing with web calendars.
+	(-_toolbarForOwner:andClientObject:): no toolbar should appear
+	when dealing with web calendars.
+
 2009-10-14  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* UI/Scheduler/UIxCalMainActions.m
@@ -8,7 +15,7 @@
  
 	* SoObjects/SOGo/NSDictionary+BSJSONAdditions.m
         Fixed the objCType comparison on GNUstep for boolean
-        values - we must consider 'c' and 'C'
+        values - we must consider 'c' and 'C'.
         * SoObjects/SOGo/SOGoCache.m
         Introduce a localCache static variable to avoid going
         to memcached all the time. We'll cache values during
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index e3b7fafac..096c41624 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -1920,13 +1920,14 @@ RANGE(2);
   if (isOrganizer)
     isOrganizer = ![ownerUser hasEmail: [[component organizer] sentBy]];
 
-  if ([[component attendees] count]
-      && [component userIsParticipant: ownerUser]
-      && !isOrganizer
-      // Lightning does not manage participation status within tasks,
-      // so we also ignore the participation status of tasks in the
-      // web interface.
-      && ![[component tag] isEqualToString: @"VTODO"])
+  if ([componentCalendar isKindOfClass: [SOGoWebAppointmentFolder class]]
+      || ([[component attendees] count]
+	  && [component userIsParticipant: ownerUser]
+	  && !isOrganizer
+	  // Lightning does not manage participation status within tasks,
+	  // so we also ignore the participation status of tasks in the
+	  // web interface.
+	  && ![[component tag] isEqualToString: @"VTODO"]))
     toolbarFilename = @"SOGoEmpty.toolbar";
   else
     {
@@ -2049,7 +2050,7 @@ RANGE(2);
                                 roles: nil];
 
   if ([componentCalendar isKindOfClass: [SOGoWebAppointmentFolder class]])
-    rc = 1;
+    rc = 2;
   else
     {
       if ([ownerUser isEqual: [context activeUser]])