diff --git a/ChangeLog b/ChangeLog
index 5de2a99e5..868f97c17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-23  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+        * UI/Scheduler/UIxComponentEditor.m - _loadAttendees
+	We set the name to the rfc822 email address if the
+	cn is not available. This avoid NOT showing attendees
+	from the Web interface when only the email address
+	was specified from the attendee list.
+
 2008-11-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index e44974a46..598022cca 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -177,7 +177,11 @@ iRANGE(2);
   attendees = [[component attendees] objectEnumerator];
   while ((currentAttendee = [attendees nextObject]))
     {
-      [names appendFormat: @"%@,", [currentAttendee cn]];
+      if ([[currentAttendee cn] length])
+	[names appendFormat: @"%@,", [currentAttendee cn]];
+      else
+	[names appendFormat: @"%@,", [currentAttendee rfc822Email]];
+	
       [emails appendFormat: @"%@,", [currentAttendee rfc822Email]];
       uid = [um getUIDForEmail: [currentAttendee rfc822Email]];
       if (uid != nil)