diff --git a/ChangeLog b/ChangeLog
index fb29ac4a1..bac5db313 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,13 @@
 	* UI/WebServerResources/SOGoDragHandles.js (adjust): for vertical
 	drag handles, prioritize the top limit rather than the bottom one.
 
+	* UI/WebServerResources/UIxContactEditor.js (onComboButtonClick):
+	return false so the form is not submitted when the button is clicked.
+
+	* UI/WebServerResources/ContactsUI.js
+	(onCategoriesMenuPrepareVisibility): don't verify the selection if
+	the list doesn't exist (happens in the contact editor).
+
 2010-11-05  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/MailerUI/UIxMailListActions.m (-getSortedUIDsAction): now
diff --git a/UI/Templates/ContactsUI/UIxContactEditor.wox b/UI/Templates/ContactsUI/UIxContactEditor.wox
index af9c49758..ebb3eb41c 100644
--- a/UI/Templates/ContactsUI/UIxContactEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditor.wox
@@ -8,6 +8,7 @@
   xmlns:label="OGo:label"
   className="UIxPageFrame"
   title="name"
+  const:userDefaultsKeys="SOGoContactsCategories"
   const:popup="YES"
   >
   <div class="menu" id="categoriesMenu">
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 6880bbd33..27ffbc2d3 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -1302,30 +1302,34 @@ function resetCategoriesMenu() {
 }
 
 function onCategoriesMenuPrepareVisibility() {
-    var rows = contactsList.getSelectedRows();
-    if (rows.length > 0) {
-        var catList = rows[0].getAttribute("categories");
-        var catsArray;
-        if (catList && catList.length > 0) {
-            catsArray = catList.split(",");
-        }
-        else {
-            catsArray = [];
-        }
-
-        var menu = $("categoriesMenu");
-        var ul = menu.down("ul");
-        var listElements = ul.select("li");
-        for (var i = 0; i < listElements.length; i++) {
-            var li = listElements[i];
-            if (catsArray.indexOf(li.category) > -1) {
-                li.addClassName("_chosen");
+    var contactsList = $("contactsList");
+    if (contactsList) {
+        var rows = contactsList.getSelectedRows();
+        if (rows.length > 0) {
+            var catList = rows[0].getAttribute("categories"); log ("cats = " + catList);
+            var catsArray;
+            if (catList && catList.length > 0) {
+                catsArray = catList.split(",");
             }
             else {
-                li.removeClassName("_chosen");
+                catsArray = [];
+            }
+
+            var menu = $("categoriesMenu");
+            var ul = menu.down("ul");
+            var listElements = ul.select("li");
+            for (var i = 0; i < listElements.length; i++) {
+                var li = listElements[i];
+                if (catsArray.indexOf(li.category) > -1) {
+                    li.addClassName("_chosen");
+                }
+                else {
+                    li.removeClassName("_chosen");
+                }
             }
         }
     }
+    return true;
 }
 
 function onCategoriesMenuItemClick() {
diff --git a/UI/WebServerResources/UIxContactEditor.js b/UI/WebServerResources/UIxContactEditor.js
index 8bb8c54c6..074d1090a 100644
--- a/UI/WebServerResources/UIxContactEditor.js
+++ b/UI/WebServerResources/UIxContactEditor.js
@@ -213,7 +213,7 @@ function onComboButtonClick(event) {
                     "left": menuLeft + "px",
                     "width": width + "px" });
 
-    event.preventDefault();
+    return false;
 }
 
 function onCategoryInputChange(event) {