diff --git a/ChangeLog b/ChangeLog
index 9b20d508d..28ba383a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-08-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/SchedulerUI.js: (initCalendars): avoid
+	setting "showCompletedTasks" when in a popup, since this needs
+	access to a UserDefaults dictionary which is not present nor event
+	required.
+
 	* Main/SOGo+DAV.m (-davCurrentUserPrincipal): new method
 	implementing the "{DAV:}current-user-principal" property.
 
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index e3b8a6bf8..88acd0543 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -2722,7 +2722,6 @@ function onDocumentKeydown(event) {
 function initCalendars() {
     sorting["attribute"] = "start";
     sorting["ascending"] = true;
-    showCompletedTasks = parseInt(UserSettings['ShowCompletedTasks']);
 
     if (!$(document.body).hasClassName("popup")) {
         var node = $("filterpopup");
@@ -2735,6 +2734,7 @@ function initCalendars() {
         initDateSelectorEvents();
         initCalendarSelector();
         configureSearchField();
+        showCompletedTasks = parseInt(UserSettings['ShowCompletedTasks']);
         configureLists();
         $("calendarList").attachMenu("calendarsMenu");
         $(document.body).observe("click", onBodyClickHandler);