diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 170543aa0e..c775d3d81c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-07  JP Rosevear  <jpr@novell.com>
+
+	* gui/dialogs/event-editor.c (event_editor_edit_comp): clear the
+	attendees, somehow I remove this in an earlier commit
+
 2005-01-07  Rodrigo Moya <rodrigo@novell.com>
 
 	* gui/dialogs/event-page.glade:
diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
index e528b15f75..91007dece2 100644
--- a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
+++ b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
@@ -10,7 +10,6 @@
 
 	<oaf_attribute name="name" type="string"
                        _value="Evolution Calendar alarm notification service"/>
-
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify:@VERSION@"
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index fb550d9724..a4edd680f9 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -211,6 +211,9 @@ event_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 	e_cal_component_get_organizer (comp, &organizer);
 	e_cal_component_get_attendee_list (comp, &attendees);
 
+	/* Clear things up */
+	e_meeting_store_remove_all_attendees (priv->model);
+
 	/* Set up the attendees */
 	if (attendees == NULL && !priv->is_meeting) {
 		if (priv->meet_page)