diff --git a/ChangeLog b/ChangeLog
index 06348ca15..130f76ba7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-12-23  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/PreferencesUI/UIxPreferences.m (-vacationEndDate): return
+	current date when no end date is defined.
+
 	* Tools/SOGoToolUserPreferences.m (-run): fixed possible out of
 	bound exception when parsing arguments.
 
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index c68246962..91ad95ca4 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -914,7 +914,10 @@
 
   time = [[vacationOptions objectForKey: @"endDate"] intValue];
 
-  return [NSCalendarDate dateWithTimeIntervalSince1970: time];
+  if (time > 0)
+    return [NSCalendarDate dateWithTimeIntervalSince1970: time];
+  else
+    return [NSCalendarDate calendarDate];
 }
 
 /* mail forward */