1.1 --- a/imipweb/event.py	Sat Apr 04 21:07:29 2015 +0200
     1.2 +++ b/imipweb/event.py	Sat Apr 04 21:20:12 2015 +0200
     1.3 @@ -502,8 +502,9 @@
     1.4          is_organiser = get_uri(obj.get_value("ORGANIZER")) == self.user
     1.5          initial_load = not args.has_key("editing")
     1.6  
     1.7 +        existing_attendees = uri_values(obj.get_values("ATTENDEE") or [])
     1.8          attendees = is_organiser and self.handle_attendees(obj) or \
     1.9 -            (initial_load or not is_organiser) and uri_values(obj.get_values("ATTENDEE")) or []
    1.10 +            (initial_load or not is_organiser) and existing_attendees or []
    1.11  
    1.12          (dtstart, dtstart_attr), (dtend, dtend_attr) = self.get_event_period(obj)
    1.13          self.show_object_datetime_controls(dtstart, dtend)
    1.14 @@ -614,7 +615,7 @@
    1.15  
    1.16                          # Permit the removal of newly-added attendees.
    1.17  
    1.18 -                        remove_type = partstat and "checkbox" or "submit"
    1.19 +                        remove_type = (value in existing_attendees and value != self.user) and "checkbox" or "submit"
    1.20  
    1.21                          self._control("remove", remove_type, value, value in args.get("remove", []), id="remove-%d" % i, class_="remove")
    1.22