diff --git a/ChangeLog b/ChangeLog
index f8eea562b..e8e8fa13c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2009-10-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxComponentEditor.m (-setComponent:): we invoke
+	_loadAttendee only when "jsonAttendees" is not set, even though
+	that condition should always be true.
+
+	* UI/PreferencesUI/UIxPreferences.m (-setCategoriesValue): we use
+	[self errorWithFormat:] rather than NSLog to output
+	deserialization errors.
+
 	* UI/Scheduler/UIxAppointmentEditor.m (-delegateAction): same as
 	below.
 
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index a492bc168..69412c79c 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -30,6 +30,8 @@
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
 
+#import <NGExtensions/NSObject+Logs.h>
+
 #import <SoObjects/SOGo/NSArray+Utilities.h>
 #import <SoObjects/SOGo/NSDictionary+Utilities.h>
 #import <SoObjects/SOGo/NSString+Utilities.h>
@@ -369,8 +371,7 @@ static BOOL forwardEnabled = NO;
   NSMutableArray *daysList;
   unsigned int currentDay;
 
-  daysList = [NSMutableArray new];
-  [daysList autorelease];
+  daysList = [NSMutableArray array];
   for (currentDay = 0; currentDay < 7; currentDay++)
     [daysList addObject: [NSString stringWithFormat: @"%d", currentDay]];
 
@@ -751,8 +752,7 @@ static BOOL forwardEnabled = NO;
   addressesList = [vacationOptions objectForKey: @"autoReplyEmailAddresses"];
   if (!addressesList)
     {
-      newAddressesList = [NSMutableArray new];
-      [newAddressesList autorelease];
+      newAddressesList = [NSMutableArray array];
       addressesList = [NSMutableArray arrayWithArray: [user allEmails]];
       for (i = 0; i < [addressesList count]; i++)
 	{
@@ -1031,10 +1031,10 @@ static BOOL forwardEnabled = NO;
                                            mutabilityOption: NSPropertyListImmutable
                                                      format: &format
                                            errorDescription: &error];
-  
-  if(!plist)
+  if (!plist)
     {
-      NSLog(error);
+      [self errorWithFormat: @"an error occured during deserialization"
+                             @" of categories: %@", error];
       [error release];
     }
   else
@@ -1045,7 +1045,6 @@ static BOOL forwardEnabled = NO;
                        forKey: @"CalendarCategoriesColors"];
       NSLog ([plist description]);
     }
-  
 }
 
 - (NSArray *) languages
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index abeeec8eb..e3b7fafac 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -550,7 +550,8 @@ iRANGE(2);
 	  ASSIGN (organizer, [component organizer]);
 	  
 	  [self _loadCategories];
-	  [self _loadAttendees];
+          if (!jsonAttendees)
+            [self _loadAttendees];
 	  [self _loadRRules];
 	  [self _loadAlarms];