diff --git a/ChangeLog b/ChangeLog
index 577bbd672..ed0409dd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-10-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/iCalEntityObject+Agenor.[hm]: new
+	category that provides facility methods and interfaces to the
+	AgenorUserManager.
+
 	* SoObjects/Contacts/product.plist: give full access to ANY
 	authenticated user, not just the owner (to every objects...).
 
diff --git a/SoObjects/Appointments/iCalEntityObject+Agenor.h b/SoObjects/Appointments/iCalEntityObject+Agenor.h
new file mode 100644
index 000000000..e65debfe6
--- /dev/null
+++ b/SoObjects/Appointments/iCalEntityObject+Agenor.h
@@ -0,0 +1,34 @@
+/* iCalEntityObject+Agenor.h - this file is part of SOGo
+ *
+ * Copyright (C) 2006 Inverse groupe conseil
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef ICALENTITYOBJECT_AGENOR_H
+#define ICALENTITYOBJECT_AGENOR_H
+
+#import <NGCards/iCalEntityObject.h>
+
+@interface iCalEntityObject (SOGoAgenorUserMgmt)
+
+- (void) setOrganizerWithUid: (NSString *) organizerUid;
+
+@end
+
+#endif /* ICALENTITYOBJECT_AGENOR_H */
diff --git a/SoObjects/Appointments/iCalEntityObject+Agenor.m b/SoObjects/Appointments/iCalEntityObject+Agenor.m
new file mode 100644
index 000000000..2488917f4
--- /dev/null
+++ b/SoObjects/Appointments/iCalEntityObject+Agenor.m
@@ -0,0 +1,39 @@
+/* iCalEntityObject+Agenor.m - this file is part of SOGo
+ *
+ * Copyright (C) 2006 Inverse groupe conseil
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#import <SoObjects/SOGo/AgenorUserManager.h>
+
+#import "iCalEntityObject+Agenor.h"
+
+@implementation iCalEntityObject (SOGoAgenorUserMgmt)
+
+- (void) setOrganizerWithUid: (NSString *) organizerUid
+{
+  iCalPerson *organizer;
+
+  organizer
+    = [[AgenorUserManager sharedUserManager] iCalPersonWithUid: organizerUid];
+  if (organizer)
+    [self setOrganizer: organizer];
+}
+
+@end