diff --git a/ChangeLog b/ChangeLog
index 1c9a754d2..4bf6bac63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-03-29  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/WebServerResources/UIxPreferences.js (savePreferences): fixed
+	validation of end date of vacation of message when not using ISO
+	format (currently limited to French).
+
 	* UI/WebServerResources/ContactsUI.js (startDragging): create an
 	overlapping safety block (div) to avoid possible selection of the
 	underlying text.
diff --git a/UI/WebServerResources/JavascriptAPIExtensions.js b/UI/WebServerResources/JavascriptAPIExtensions.js
index c0cc50b4a..a4b7e1414 100644
--- a/UI/WebServerResources/JavascriptAPIExtensions.js
+++ b/UI/WebServerResources/JavascriptAPIExtensions.js
@@ -52,11 +52,11 @@ String.prototype.asDate = function () {
     var newDate;
     var date = this.split("/");
     if (date.length == 3)
-        newDate = new Date(date[2], date[1] - 1, date[0]);
+        newDate = new Date(date[2], date[1] - 1, date[0]); // dd/mm/yyyy
     else {
         date = this.split("-");
         if (date.length == 3)
-            newDate = new Date(date[0], date[1] - 1, date[2]);
+            newDate = new Date(date[0], date[1] - 1, date[2]); // yyyy-mm-dd
         else {
             if (this.length == 8) {
                 newDate = new Date(this.substring(0, 4),
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 33966bbac..0a76018e6 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -39,7 +39,7 @@ function savePreferences(sender) {
 	  sendForm = false;
 	}
         if ($("enableVacationEndDate") && $("enableVacationEndDate").checked) {
-            var endDate = new Date($("vacationEndDate_date").value);
+            var endDate = $("vacationEndDate_date").value.asDate();
             var now = new Date();
             if (endDate.getTime() < now.getTime()) {
                 showAlertDialog(_("End date of your auto reply must be in the future."));