diff --git a/ChangeLog b/ChangeLog
index d8df2f4a9..0f0763e21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/generic.js (onLoadHandler): don't trigger
+	the alarm refresh if the "calendarBannerLink" link is not
+	available (when calendar is disabled).
+
+	* UI/WebServerResources/UIxPreferences.js (initPreferences)
+	(savePreferences): don't bother with the categoriesList if it's
+	not accessible (when calendar is disabled).
+
 2009-09-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* Tests/test-config.py: new functional test to validate the test
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 401058543..296df42a5 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -5,10 +5,12 @@ function savePreferences(sender) {
     if (sigList)
         sigList.disabled=false;
 
-    serializeCategories (null);
+    if ($("categoriesList")) {
+        serializeCategories(null);
+    }
 
     $("mainForm").submit();
-    
+
     return false;
 }
 
@@ -47,15 +49,17 @@ function initPreferences() {
         onComposeMessagesTypeChange ();
     }
 
-    resetCategoriesColors (null);
     var table = $("categoriesList");
-    var r = $$("TABLE#categoriesList tbody tr");
-    for (var i=0; i<r.length; i++)
-        r[i].identify ();
-    table.multiselect = true;
-    resetTableActions ();
-    $("categoryAdd").observe ("click", onCategoryAdd);
-    $("categoryDelete").observe ("click", onCategoryDelete);
+    if (table) {
+        resetCategoriesColors (null);
+        var r = $$("TABLE#categoriesList tbody tr");
+        for (var i=0; i<r.length; i++)
+            r[i].identify ();
+        table.multiselect = true;
+        resetTableActions ();
+        $("categoryAdd").observe ("click", onCategoryAdd);
+        $("categoryDelete").observe ("click", onCategoryDelete);
+    }
 
     // Disable placement (after) if composing in HTML
     if ($("composeMessagesType")) {
@@ -204,7 +208,6 @@ function serializeCategories (e) {
     $("categoriesValue").value = "(" + names + ", " + colors + ")";
 }
 
-
 function resetCategoriesColors (e) {
     var divs = $$("TABLE#categoriesList DIV.colorBox");
 
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 23040653b..3fc9a5571 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1482,7 +1482,9 @@ function onLoadHandler(event) {
     queryParameters = parseQueryParameters('' + window.location);
     if (!$(document.body).hasClassName("popup")) {
         initLogConsole();
-        refreshAlarms();
+        if ($("calendarBannerLink")) {
+            refreshAlarms();
+        }
     }
     initCriteria();
     configureSearchField();