diff --git a/ChangeLog b/ChangeLog
index 9e181cd45..ee5d08e9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/ContactsUI.js: (setEventsOnAddressBook)
+	enable the "dblclick" event on non-owned addressbooks, except the
+	public ones (owned by "nobody")
+	(onAddressBookModify): enable the renaming of non-owned
+	addressbooks, except the public ones
+
 2010-10-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUser.m (-_appendSystemMailAccount): check
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index bc2cad709..b61a332ac 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -969,24 +969,24 @@ function setEventsOnAddressBook(folder) {
 
     node.observe("mousedown", listRowMouseDownHandler);
     node.observe("click", onRowClick);
-    if (UserLogin == node.readAttribute("owner"))
-        // Only the owner of the addressbook can rename it
+    if (node.readAttribute("owner") != "nobody") {
         node.observe("dblclick", onAddressBookModify);
+    }
 }
 
 function onAddressBookModify(event) {
     var folders = $("contactFolders");
     var selected = folders.getSelectedNodes()[0];
-
-    if (UserLogin == selected.getAttribute("owner")) {
+    if (selected.getAttribute("owner") == "nobody") {
+        showAlertDialog(_("Unable to rename that folder!"));
+    }
+    else {
         var currentName = selected.innerHTML.unescapeHTML();
         showPromptDialog(_("Properties"),
                          _("Address Book Name"),
                          onAddressBookModifyConfirm,
                          currentName);
     }
-    else
-        showAlertDialog(_("Unable to rename that folder!")); // WARNING: super users will end up here
 }
 
 function onAddressBookModifyConfirm() {