diff --git a/ChangeLog b/ChangeLog
index 95e2f8bd4..5c01d3c85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-04-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/SchedulerUI.js (initCalendars): initialize
+	"showCompletedTaskls" to 0 when the ShowCompletedTasks settings
+	variable is not available.
+
 	* SoObjects/Appointments/SOGoCalendarComponent.m
 	(-contentAsString): strip alarms from component if the alarms are
 	disabled on the containing calendar.
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 6b21df15e..7572e7873 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -2917,7 +2917,12 @@ function initCalendars() {
         var controller = new SOGoTabsController();
         controller.attachToTabsContainer(tabsContainer);
 
-        showCompletedTasks = parseInt(UserSettings['ShowCompletedTasks']);
+        if (UserSettings['ShowCompletedTasks']) {
+            showCompletedTasks = parseInt(UserSettings['ShowCompletedTasks']);
+        }
+        else {
+            showCompletedTasks = 0;
+        }
         initDateSelectorEvents();
         initCalendarSelector();
         configureSearchField();