diff --git a/ChangeLog b/ChangeLog
index b2724257c..f8b573c92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-20  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/WebServerResources/UIxAppointmentEditor.js (_getDate):
+	retrieve the time using a regexp to insure a valid entry.
+
 	* UI/WebServerResources/MailerUI.js (onMenuEmptyTrashCallback):
 	when emptying the trash folder, reset the unseen count and reset
 	the reference to the last selected message.
diff --git a/UI/WebServerResources/UIxAppointmentEditor.js b/UI/WebServerResources/UIxAppointmentEditor.js
index b2a853213..5517560d2 100644
--- a/UI/WebServerResources/UIxAppointmentEditor.js
+++ b/UI/WebServerResources/UIxAppointmentEditor.js
@@ -227,9 +227,11 @@ function endDayAsShortString() {
 
 function _getDate(which) {
     var date = window.timeWidgets[which]['date'].inputAsDate();
-    var time = window.timeWidgets[which]['time'].value.split(":");
-    date.setHours(time[0]);
-    date.setMinutes(time[1]);
+    var time = window.timeWidgets[which]['time'].value.match(/([0-9]{1,2}):?([0-9]{2})/);
+    if (time) {
+        date.setHours(time[1]);
+        date.setMinutes(time[2]);
+    }
 
     return date;
 }
@@ -287,7 +289,6 @@ function onAdjustTime(event) {
         window.timeWidgets['end']['time'].updateShadowValue();
         window.timeWidgets['start']['date'].updateShadowValue();
         window.timeWidgets['start']['time'].updateShadowValue();
-        log ("end " + window.timeWidgets['end']['time'].value);
         if (window.timeWidgets['end']['time'].onChange) window.timeWidgets['end']['time'].onChange(); // method from SOGoTimePicker
     }
     else {