diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index e6196b0b5..d9d7a876a 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -455,7 +455,7 @@ function onHeaderClick(event) {
 }
 
 function newContact(sender) {
-  openContactWindow(URLForFolderID(currentContactFolder) + "/new");
+  openContactWindow(URLForFolderID(currentContactFolder) + "/newcontact");
 
   return false; /* stop following the link */
 }
diff --git a/UI/WebServerResources/UIxContactEditor.js b/UI/WebServerResources/UIxContactEditor.js
index 76910d032..97d38c704 100644
--- a/UI/WebServerResources/UIxContactEditor.js
+++ b/UI/WebServerResources/UIxContactEditor.js
@@ -127,11 +127,18 @@ function onFnNewValue(event) {
   return true;
 }
 
+function onEditorCancelClick(event) {
+   preventDefault(event);
+   window.close();
+}
+
 function initEditorForm() {
   displayNameChanged = ($("fn").value.length > 0);
   $("fn").onkeydown = onFnKeyDown;
   $("sn").onkeyup = onFnNewValue;
   $("givenName").onkeyup = onFnNewValue;
+
+  $("cancelButton").observe("click", onEditorCancelClick);
 }
 
 FastInit.addOnLoad(initEditorForm);