diff --git a/ChangeLog b/ChangeLog
index d3aeb5bc1..8882bd889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-11-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/AgenorUserDefaults.m ([AgenorUserDefaults
+	-primaryFetchProfile]): make sure that the deserialized "values"
+	is an instance of NSMutableDictionary, otherwise we override it
+	with one.
+
 	* SoObjects/Mailer/SOGoMailObject+Draft.m ([SOGoMailObject
 	-contentForReply]): make use of the SOGoMailReply WO page.
 
diff --git a/SoObjects/SOGo/AgenorUserDefaults.m b/SoObjects/SOGo/AgenorUserDefaults.m
index 39778f76f..5c7db08dc 100644
--- a/SoObjects/SOGo/AgenorUserDefaults.m
+++ b/SoObjects/SOGo/AgenorUserDefaults.m
@@ -158,7 +158,10 @@ static NSString *uidColumnName = @"c_uid";
 					       mutabilityOption: NSPropertyListMutableContainers
 					       format: NULL
 					       errorDescription: &error];
-	      [values retain];
+	      if ([values isKindOfClass: [NSMutableDictionary class]])
+		[values retain];
+	      else
+		values = [NSMutableDictionary new];
 	    }
 
 	  ASSIGN (lastFetch, [NSCalendarDate date]);