diff --git a/ChangeLog b/ChangeLog
index fa939956e..4b4dbc590 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-13  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/WebServerResources/UIxAppointmentEditor.js (handleAllDay)
+	(_setDate): fixed errors when event lasts all-day.
+
 	* SoObjects/Mailer/SOGoMailFolder.m
 	(-deleteUIDs:useTrashFolder:inContext:): the withTrash argument is
 	now a pointer since the method can modify it when the current
diff --git a/UI/WebServerResources/UIxAttendeesEditor.js b/UI/WebServerResources/UIxAttendeesEditor.js
index 705b6f04b..e3fc1aecd 100644
--- a/UI/WebServerResources/UIxAttendeesEditor.js
+++ b/UI/WebServerResources/UIxAttendeesEditor.js
@@ -20,15 +20,11 @@ var attendeesEditor = {
 };
 
 function handleAllDay() {
-    window.timeWidgets['start']['hour'].value = dayStartHour;
-    window.timeWidgets['start']['minute'].value = 0;
-    window.timeWidgets['end']['hour'].value = dayEndHour;
-    window.timeWidgets['end']['minute'].value = 0;
+    window.timeWidgets['start']['time'].value = dayStartHour + ":00";
+    window.timeWidgets['end']['time'].value = dayEndHour + ":00";
 
-    $("startTime_time_hour").disabled = true;
-    $("startTime_time_minute").disabled = true;
-    $("endTime_time_hour").disabled = true;
-    $("endTime_time_minute").disabled = true;
+    $("startTime_time").disabled = true;
+    $("endTime_time").disabled = true;
 
     $("freeBusyTimeRange").addClassName("hidden");
 }
@@ -1724,8 +1720,10 @@ function getShadowEndDate() {
 
 function _setDate(which, newDate) {
     window.timeWidgets[which]['date'].setInputAsDate(newDate);
-    window.timeWidgets[which]['time'].value = newDate.getDisplayHoursString();
-    window.timeWidgets[which]['time'].onChange(); // method from SOGoTimePicker
+    if (!isAllDay) {
+        window.timeWidgets[which]['time'].value = newDate.getDisplayHoursString();
+        window.timeWidgets[which]['time'].onChange(); // method from SOGoTimePicker
+    }
 }
 
 function setStartDate(newStartDate) {