diff --git a/ChangeLog b/ChangeLog
index db357eccd..50d7e01a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-15  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/SOGo/SOGoUserDefaults.m ([SOGoUserDefaults
+	-setObject:forKey:]): fix an issue when calling removeObjectForKey
+	and value is nil.
+
 2009-05-12  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/SOGo/LDAPSource.m ([LDAPSource -initFromSource:]):
diff --git a/SoObjects/SOGo/SOGoUserDefaults.m b/SoObjects/SOGo/SOGoUserDefaults.m
index 7bcd5cf90..1481c7688 100644
--- a/SoObjects/SOGo/SOGoUserDefaults.m
+++ b/SoObjects/SOGo/SOGoUserDefaults.m
@@ -379,7 +379,10 @@ static NSString *uidColumnName = @"c_uid";
     }
 
   /* set in hash and mark as modified */
-  [values setObject: value forKey: key];
+  if (value)
+    [values setObject: value forKey: key];
+  else
+    [values removeObjectForKey: key];
 
   defFlags.modified = YES;
 }