diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 67eeb92c7..b27a5e922 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -1972,7 +1972,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 	      NSArray *allAttendees;
 
 	      organizerUser = [SOGoUser userWithLogin: uid];
-              defaultIdentity = [organizerUser defaultIdentity];
+              defaultIdentity = [organizerUser primaryIdentity];
 	      organizer = [[event organizer] copy];
               [organizer setCn: [defaultIdentity objectForKey: @"fullName"]];
               [organizer setEmail: [defaultIdentity objectForKey: @"email"]];
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 62e91439d..18b1a0616 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -828,7 +828,7 @@
 
           // No organizer, grab the event's owner
           if (![senderEmail length])
-            senderEmail = shortSenderEmail = [[ownerUser defaultIdentity] objectForKey: @"email"];
+            senderEmail = shortSenderEmail = [[ownerUser primaryIdentity] objectForKey: @"email"];
 
           /* calendar part */
           eventBodyPart = [self _bodyPartForICalObject: object];
diff --git a/SoObjects/Appointments/iCalAlarm+SOGo.m b/SoObjects/Appointments/iCalAlarm+SOGo.m
index 51e0d8a75..4bc3259eb 100644
--- a/SoObjects/Appointments/iCalAlarm+SOGo.m
+++ b/SoObjects/Appointments/iCalAlarm+SOGo.m
@@ -59,7 +59,7 @@
   iCalPerson *aAttendee;
 
   ownerIdentity = [[SOGoUser userWithLogin: uid roles: nil]
-                    defaultIdentity];
+                    primaryIdentity];
   aAttendee = [iCalPerson elementWithTag: @"attendee"];
   [aAttendee setCn: [ownerIdentity objectForKey: @"fullName"]];
   [aAttendee setEmail: [ownerIdentity objectForKey: @"email"]];