diff --git a/UI/Scheduler/UIxComponent+Agenor.h b/UI/Scheduler/UIxComponent+Scheduler.h
similarity index 93%
rename from UI/Scheduler/UIxComponent+Agenor.h
rename to UI/Scheduler/UIxComponent+Scheduler.h
index 84a837d13..df55a864b 100644
--- a/UI/Scheduler/UIxComponent+Agenor.h
+++ b/UI/Scheduler/UIxComponent+Scheduler.h
@@ -30,10 +30,6 @@
 
 - (NSArray *) getICalPersonsFromValue: (NSString *) selectorValue;
 
-/* email, cn */
-- (NSString *) emailForUser;
-- (NSString *) cnForUser;
-
 @end
 
 #endif	/* __UIxComponent_Agenor_H_ */
diff --git a/UI/Scheduler/UIxComponent+Agenor.m b/UI/Scheduler/UIxComponent+Scheduler.m
similarity index 76%
rename from UI/Scheduler/UIxComponent+Agenor.m
rename to UI/Scheduler/UIxComponent+Scheduler.m
index 20aa370d0..26dc48215 100644
--- a/UI/Scheduler/UIxComponent+Agenor.m
+++ b/UI/Scheduler/UIxComponent+Scheduler.m
@@ -19,11 +19,11 @@
   02111-1307, USA.
 */
 
-#include "UIxComponent+Agenor.h"
-#include <SOGo/AgenorUserManager.h>
-#include <SOGo/WOContext+Agenor.h>
-#include <SOGo/SOGoUser.h>
-#include "common.h"
+#import <SoObjects/Appointments/SOGoCalendarComponent.h>
+#import <SoObjects/SOGo/WOContext+Agenor.h>
+#import <SoObjects/SOGo/SOGoUser.h>
+
+#import "UIxComponent+Scheduler.h"
 
 @implementation UIxComponent(Agenor)
 
@@ -32,9 +32,9 @@
   NSMutableArray *persons;
   NSEnumerator *uids;
   NSString *uid;
-  AgenorUserManager *um;
+  SOGoCalendarComponent *component;
 
-  um = [AgenorUserManager sharedUserManager];
+  component = [self clientObject];
 
   persons = [NSMutableArray new];
   [persons autorelease];
@@ -46,7 +46,7 @@
       uid = [uids nextObject];
       while (uid)
         {
-          [persons addObject: [um iCalPersonWithUid: uid]];
+          [persons addObject: [component iCalPersonWithUID: uid]];
           uid = [uids nextObject];
         }
     }
@@ -54,14 +54,4 @@
   return persons;
 }
 
-- (NSString *) emailForUser
-{
-  return [[context activeUser] email];
-}
-
-- (NSString *) cnForUser
-{
-  return [[context activeUser] cn];
-}
-
 @end /* UIxComponent(Agenor) */