diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index bda9655b64..538ed9ef4d 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -2331,7 +2331,7 @@ class calendar_uiforms extends calendar_ui
 					else
 					{
 						// keep all EGroupware only values of existing events plus alarms
-						unset($event['alarm'], $event['organizer']);
+						unset($event['alarm'], $event['owner']);
 						$event = array_merge($event['old'], $event);
 					}
 					unset($event['old']);
diff --git a/calendar/templates/default/meeting.xet b/calendar/templates/default/meeting.xet
index 104bf15dc9..e23707d786 100644
--- a/calendar/templates/default/meeting.xet
+++ b/calendar/templates/default/meeting.xet
@@ -31,7 +31,7 @@
 						<button label="Accept" id="button[accept]" class="leftPad5" background_image="true" image="calendar/accepted"/>
 						<button label="Tentative" id="button[tentativ]" class="leftPad5" background_image="true" image="calendar/tentative"/>
 						<button label="Reject" id="button[reject]" class="leftPad5" background_image="true" image="calendar/rejected"/>
-						<button statustext="Edit event in calendar" label="Edit" id="button[edit]"  background_image="true" image="edit" hideOnReadonly="true"
+						<buttononly statustext="Edit event in calendar" label="Edit" id="button[edit]"  background_image="true" image="edit" hideOnReadonly="true"
 							onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.edit&amp;cal_id=$cont[id]'),'_blank','dependent=yes,width=750,height=410,scrollbars=yes,status=yes'); return false;" class="leftPad5"/>
 					</hbox>
 					<description id="error" class="meetingRequestError" align="right"/>