diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index ef56c917c..fcf79292d 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -1820,17 +1820,17 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
           [self warnWithFormat: @"Invalid event: no end date; setting duration to %@", [event duration]];
         }
 
-      if ([event organizer] && ![[[event organizer] cn] length])
-        {
-          [[event organizer] setCn: [[event organizer] rfc822Email]];
-        }
-
-      // We now make sure that the organizer, if managed by SOGo, is using
-      // its default email when creating events and inviting attendees.
       if ([event organizer])
         {
           NSString *uid;
 
+          if (![[[event organizer] cn] length])
+            {
+              [[event organizer] setCn: [[event organizer] rfc822Email]];
+            }
+
+          // We now make sure that the organizer, if managed by SOGo, is using
+          // its default email when creating events and inviting attendees.
           uid = [[SOGoUserManager sharedUserManager] getUIDForEmail: [[event organizer] rfc822Email]];
           if (uid)
             {