diff --git a/ChangeLog b/ChangeLog
index 5d07f8d5c..95b18639c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-03-27  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/AgenorUserDefaults.m ([AgenorUserDefaults
+	-primaryFetchProfile]): we unescape the fetched value before
+	constructing the NSDictionary.
+
 	* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
 	-setComponent:newComponent]): the weeks start on sunday in
 	OpenStep and are indexed from 0.
diff --git a/SoObjects/SOGo/AgenorUserDefaults.m b/SoObjects/SOGo/AgenorUserDefaults.m
index 156b4ffeb..590b1a55d 100644
--- a/SoObjects/SOGo/AgenorUserDefaults.m
+++ b/SoObjects/SOGo/AgenorUserDefaults.m
@@ -153,6 +153,10 @@ static NSString *uidColumnName = @"c_uid";
 	  value = [row objectForKey: fieldName];
 	  if ([value isNotNull])
 	    {
+	      value = [value stringByReplacingString: @"''"
+			     withString: @"'"];
+	      value = [value stringByReplacingString: @"\\\\"
+			     withString: @"\\"];
 	      plistData = [value dataUsingEncoding: NSUTF8StringEncoding];
 	      values
 		= [NSPropertyListSerialization propertyListFromData: plistData