diff --git a/ChangeLog b/ChangeLog
index a45b11cbc..a4f912793 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m (_enforceTimeLimitOnFilter):
 	Rewrote algorithm, fixed cyclic events issue.
+	* UI/WebServerResources/UIxAttendeesEditor.js: Fixed update bug on "enter"
+	* UI/Templates/SchedulerUI/UIxAttendeesEditor.wox: Removed next/prev hour
+	and zoom buttons
 
 2009-06-02  Ludovic Marcotte <lmarcotte@inverse.ca>
 
diff --git a/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox b/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox
index 14a4ef391..1abb27e27 100644
--- a/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox
@@ -26,6 +26,7 @@
       <a href="#" class="button _disabled"
 	><var:string label:value="Next slot" /></a>
     </div>
+    <!--
     <div id="freeBusyZoomButtons">
       <var:string label:value="Zoom:"/>
       <a href="#" class="button _disabled"><var:string label:value="-" /></a>
@@ -33,6 +34,7 @@
 	string="itemZoomText" selection="zoom"/>
       <a href="#" class="button _disabled"><var:string label:value="+" /></a>
     </div>
+    -->
     <div id="freeBusyView">
       <table id="freeBusy" cellspacing="0" cellpadding="0"
 	xmlns="http://www.w3.org/1999/xhtml"
@@ -93,12 +95,12 @@
 	      ><var:string label:value="No free-busy information" /></li>
 	</ul>
       </div>
-      <div id="freeBusyButtons">
+      <!--<div id="freeBusyButtons">
         <a href="#" class="button _disabled"
 	  ><var:string label:value="Previous hour" /></a>
         <a href="#" class="button _disabled"
 	  ><var:string label:value="Next hour" /></a>
-      </div>
+      </div>-->
       <div id="freeBusyReplicas">
 	<div><var:string label:value="Start:"
             /><var:component className="UIxTimeDateControl"
diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js
index c4425fa11..6f6ba0e96 100644
--- a/UI/WebServerResources/UIxAttendeesEditor.js
+++ b/UI/WebServerResources/UIxAttendeesEditor.js
@@ -60,12 +60,16 @@ function onContactKeydown(event) {
     preventDefault(event);
     if (this.confirmedValue)
       this.value = this.confirmedValue;
-    if (this.uid)
-      this.blur(); // triggers checkAttendee function call
     $(this).selectText(0, this.value.length);
     if (document.currentPopupMenu)
       hideMenu(document.currentPopupMenu);
     attendeesEditor.selectedIndex = -1;
+    if (this.uid) {
+      this.hasfreebusy = false;
+      this.setAttribute ("modified", "1");
+      this.blur(); // triggers checkAttendee function call
+    }
+
   }
   else if ($('attendeesMenu').getStyle('visibility') == 'visible') {
     attendeesEditor.currentField = this;
@@ -446,12 +450,13 @@ function initializeWindowButtons() {
 	var buttons = $("freeBusyViewButtons").childNodesWithTag("a");
 	for (var i = 0; i < buttons.length; i++)
 		buttons[i].observe("click", listRowMouseDownHandler, false);
-	buttons = $("freeBusyZoomButtons").childNodesWithTag("a");
+/*	buttons = $("freeBusyZoomButtons").childNodesWithTag("a");
 	for (var i = 0; i < buttons.length; i++)
 		buttons[i].observe("click", listRowMouseDownHandler, false);
 	buttons = $("freeBusyButtons").childNodesWithTag("a");
 	for (var i = 0; i < buttons.length; i++)
 		buttons[i].observe("click", listRowMouseDownHandler, false);
+*/
 }
 
 function onEditorOkClick(event) {