diff --git a/ChangeLog b/ChangeLog
index 804a66cb8..d94e3b07f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-02-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoFreeBusyObject.m ([SOGoFreeBusyObject
+	-iCalStringForFreeBusyInfos:_infosfrom:_startDateto:_endDate]): we
+	no longer invoke [container login], since this method has been
+	removed. Instead we invoke ownerInContext:.
+
 	* SoObjects/SOGo/SOGoFolder.m ([SOGoFolder
 	-fetchContentObjectNames]): new model method for all subclasses.
 	This will be removed in the future since toOneRelationshipKeys
diff --git a/SoObjects/Appointments/SOGoFreeBusyObject.m b/SoObjects/Appointments/SOGoFreeBusyObject.m
index 4aa053f35..b6ecfda2f 100644
--- a/SoObjects/Appointments/SOGoFreeBusyObject.m
+++ b/SoObjects/Appointments/SOGoFreeBusyObject.m
@@ -148,7 +148,7 @@
   NSDictionary *info;
   iCalFreeBusyType type;
 
-  uid = [[self container] login];
+  uid = [container ownerInContext: context];
 
   calendar = [iCalCalendar groupWithTag: @"vcalendar"];
   [calendar setProdID: @"//Inverse groupe conseil/SOGo 0.9"];