diff --git a/ChangeLog b/ChangeLog
index 94b3d9432..6becbcafc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-10-30  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/WebServerResources/UIxPreferences.js
+	(addDefaultEmailAddresses): fixed issue in vacation tab when
+	adding the defaults values to a empty list.
+
 	* UI/WebServerResources/UIxComponentEditor.js
 	(onComponentEditorClose): new method that closes definition popup
 	windows associated to the event (attendees/recurrence/reminder).
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 654bc9b9f..47933ad01 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -72,7 +72,10 @@ function onChoiceChanged(event) {
 
 function addDefaultEmailAddresses() {
     var defaultAddresses = $("defaultEmailAddresses").value.split(/, */);
-    var addresses = $("autoReplyEmailAddresses").value.split(/, */);
+    var addresses = $("autoReplyEmailAddresses").value.trim();
+    
+    if (addresses) addresses = addresses.split(/, */);
+    else addresses = new Array();
 
     defaultAddresses.each(function(adr) {
             for (var i = 0; i < addresses.length; i++)