diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 61caaedff..e8a9bda57 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -28,7 +28,7 @@
     </ul>
   </div>
 
-  <form const:href="send" name="pageform" enctype="multipart/form-data">
+  <form const:href="send" name="pageform" enctype="multipart/form-data" autocomplete="off">
     <div id="attachmentsArea">
       <var:string label:value="Attachments:" />
       <ul id="attachments">
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index 4a3d575e6..a43789c35 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -496,7 +496,7 @@ function initMailEditor() {
 //   textarea.observe("contextmenu", onTextContextMenu);
   textarea.observe("mousedown", onTextMouseDown, true);
 
-  initTabIndex(list, $$("div#subjectRow input").first(), textarea);
+  initTabIndex($("addressList"), $$("div#subjectRow input").first(), textarea);
   onWindowResize(null);
 
   Event.observe(window, "resize", onWindowResize);
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index d71903400..87f1a6588 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -990,11 +990,12 @@ function initCriteria() {
 	searchValue.setStyle({ color: "#aaa" });
       }
       // Set the checkmark to the first option
-      firstOption.addClassName("_chosen");
       if (searchOptions.chosenNode)
 	searchOptions.chosenNode.removeClassName("_chosen");
+      firstOption.addClassName("_chosen");
       searchOptions.chosenNode = firstOption;
     }
+    searchValue.blur();
   }
 }