diff --git a/UI/Scheduler/UIxCalAptListView.m b/UI/Scheduler/UIxCalAptListView.m
index 870a76f68..5da22d549 100644
--- a/UI/Scheduler/UIxCalAptListView.m
+++ b/UI/Scheduler/UIxCalAptListView.m
@@ -27,8 +27,6 @@
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <Appointments/SOGoAppointmentFolder.h>
 
-#import <SOGo/NSObject+Owner.h>
-
 #import <SOGoUI/SOGoDateFormatter.h>
 
 #import "UIxCalAptListView.h"
@@ -182,14 +180,4 @@
                    [date minuteOfHour]];
 }
 
-- (NSString *) currentRowCSSClass
-{
-  return @"tableview appointmentRow";
-}
-
-- (NSString *) currentAptOwner
-{
-  return [currentAppointment ownerLogin];
-}
-
 @end
diff --git a/UI/Scheduler/UIxCalInlineAptView.m b/UI/Scheduler/UIxCalInlineAptView.m
index 68626d905..c1bb4cf19 100644
--- a/UI/Scheduler/UIxCalInlineAptView.m
+++ b/UI/Scheduler/UIxCalInlineAptView.m
@@ -21,7 +21,6 @@
 // $Id: UIxCalInlineAptView.m 885 2005-07-21 16:41:34Z znek $
 
 #import <NGObjWeb/NGObjWeb.h>
-#import <SOGo/NSObject+Owner.h>
 
 @interface UIxCalInlineAptView : WOComponent
 {
@@ -144,7 +143,7 @@
 - (NSString *) displayClasses
 {
   return [NSString stringWithFormat: @"appointmentView ownerIs%@",
-                   [appointment ownerLogin]];
+                   [appointment objectForKey: @"owner"]];
 }
 
 /* helpers */
@@ -161,9 +160,4 @@
                            referenceDate: [self referenceDate]];
 }
 
-- (NSString *) appointmentOwner
-{
-  return [appointment ownerLogin];
-}
-
 @end
diff --git a/UI/Scheduler/UIxCalTasksListView.m b/UI/Scheduler/UIxCalTasksListView.m
index 9d0385f16..a939a76f8 100644
--- a/UI/Scheduler/UIxCalTasksListView.m
+++ b/UI/Scheduler/UIxCalTasksListView.m
@@ -27,7 +27,6 @@
 
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <Appointments/SOGoAppointmentFolder.h>
-#import <SOGo/NSObject+Owner.h>
 #import <SOGoUI/SOGoDateFormatter.h>
 
 #import "UIxCalTasksListView.h"
@@ -98,7 +97,8 @@
     }
 
   allClasses = [NSString stringWithFormat: @"%@ ownerIs%@",
-                         statusClass, [currentTask ownerLogin]];
+                         statusClass,
+                         [currentTask objectForKey: @"owner"]];
 
   return allClasses;
 }
@@ -133,9 +133,4 @@
   return ([[currentTask objectForKey: @"status"] intValue] == 1);
 }
 
-- (NSString *) currentTaskOwner
-{
-  return [currentTask ownerLogin];
-}
-
 @end
diff --git a/UI/Templates/ContactsUI/UIxContactsListView.wox b/UI/Templates/ContactsUI/UIxContactsListView.wox
index 2bb4fffca..dc04a8bb5 100644
--- a/UI/Templates/ContactsUI/UIxContactsListView.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListView.wox
@@ -47,7 +47,7 @@
             onclick="return onContactRowClick(event, this);"
             ondblclick="return onContactRowDblClick(event, this);"
             oncontextmenu="return onContactContextMenu(event, this);">
-            <td onmousedown="return false;"><img rsrc:src="abcard.gif" /><var:string value="displayName" /></td>
+            <td onmousedown="return false;"><img rsrc:src="abcard.gif" /><var:string value="displayName" const:escapeHTML="YES" /></td>
             <td onmousedown="return false;"><var:string value="currentContact.mail"            /></td>
             <td onmousedown="return false;"><var:string value="currentContact.telephonenumber" /></td>
             <td onmousedown="return false;"><var:string value="currentContact.l"               /></td>
diff --git a/UI/Templates/SchedulerUI/UIxCalAptListView.wox b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
index af15b308e..8768055d7 100644
--- a/UI/Templates/SchedulerUI/UIxCalAptListView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalAptListView.wox
@@ -41,9 +41,9 @@
         ></tr>
 
     <var:foreach list="fetchCoreAppointmentsInfos" item="currentAppointment"
-      ><tr var:class="currentRowCSSClass"
+      ><tr class="tableview appointmentRow"
         var:id="currentAppointment.c_name"
-        var:owner="currentAptOwner"
+        var:owner="currentAppointment.owner"
         onclick="return onAppointmentClick(event);"
         ondblclick="return editDoubleClickedEvent(this);"
         oncontextmenu="return onAppointmentContextMenu(event, this);"
diff --git a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
index 77ab6a227..019d843fb 100644
--- a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
@@ -15,7 +15,7 @@
           /></var:if
         ><a href="#"
         onclick="onCalendarSelectAppointment(event, this);"
-        var:owner="appointmentOwner"
+        var:owner="appointment.owner"
         ondblclick="displayAppointment(event, this);"
         var:aptCName="appointment.c_name"
         var:title="tooltip"