diff --git a/ChangeLog b/ChangeLog
index c0e49e7c8..5db0806cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-05  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/ContactsUI.js (getMenus): activated the
+	list creation option of the addresbooks contextual menu.
+
+	* UI/WebServerResources/SOGoRootPage.js (onFieldKeyDown): don't
+	submit the form if no password is typed.
+
 2009-11-04  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* Major refresh of CSS stylesheets.
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 320d5af12..096a68c85 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -1069,7 +1069,7 @@ function onContactMenuPrepareVisibility() {
 function getMenus() {
     var menus = {};
     menus["contactFoldersMenu"] = new Array(onAddressBookModify, "-", newContact,
-                                            null, "-", onAddressBookImport, 
+                                            newList, "-", onAddressBookImport, 
                                             onAddressBookRemove, "-",
                                             onMenuSharing);
     menus["contactMenu"] = new Array(onMenuEditContact, "-",
diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index 535ea302a..dc6b25c92 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -32,8 +32,8 @@ function initLogin() {
     submitBtn.disabled = false;
 }
 
-function onFieldKeyDown (event) {
-    if (event.keyCode == Event.KEY_RETURN)
+function onFieldKeyDown(event) {
+    if (event.keyCode == Event.KEY_RETURN && $("password").value.length > 0)
         return onLoginClick (event);
 }