diff --git a/ChangeLog b/ChangeLog
index 155a427a0..9c52fe0ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-03-27  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
+	-takeValuesFromRequest:_rqinContext:_ctx]): append a "uid" field
+	to the new components.
+
 	* SoObjects/SOGo/SOGoUser.m ([SOGoUser -userSettings]): new method
 	(see below).
 
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 03479b991..1b8c8d7d6 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -816,6 +816,7 @@
                      inContext: (WOContext *) _ctx
 {
   NSCalendarDate *now;
+  SOGoCalendarComponent *clientObject;
 
   [super takeValuesFromRequest: _rq inContext: _ctx];
 
@@ -826,8 +827,10 @@
   [component setUrl: url];
   [self _handleAttendeesEdition];
   [self _handleOrganizer];
-  if ([[self clientObject] isNew])
+  clientObject = [self clientObject];
+  if ([clientObject isNew])
     {
+      [component setUid: [clientObject nameInContainer]];
       [component setCreated: now];
       [component setTimeStampAsDate: now];
       [component setPriority: @"0"];