diff --git a/ChangeLog b/ChangeLog
index 452780cd7..70b1607fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoUserFolder.m (-ownerInContext:): invoke
+	setOwner: to retain user.
+
+	* SoObjects/SOGo/SOGoObject.m (-initWithName:inContainer:):
+	ownerInContext: already retains "owner".
+
 	* Main/SOGoProductLoader.m (-loadProducts): attempt to free some
 	memory after "loadAllProducts" is invoked, which consumes a lot of
 	RAM.
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 35ec06c85..4537897df 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -182,8 +182,6 @@
       if ([self doesRetainContainer])
 	[_container retain];
       owner = [self ownerInContext: context];
-      if (owner)
-	[owner retain];
     }
 
   return self;
diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m
index 5dee4dc37..a69b48a1d 100644
--- a/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SoObjects/SOGo/SOGoUserFolder.m
@@ -108,7 +108,7 @@
   if (!owner)
     {
       ownerUser = [SOGoUser userWithLogin: nameInContainer roles: nil];
-      owner = [ownerUser login];
+      [self setOwner: [ownerUser login]];
     }
 
   return owner;