diff --git a/dashboard/src/views/email.html b/dashboard/src/views/email.html
index 576cee548..c5806cda4 100644
--- a/dashboard/src/views/email.html
+++ b/dashboard/src/views/email.html
@@ -36,9 +36,9 @@
           <div class="form-group">
               <label class="control-label">Name</label>
               <div class="input-group form-inline" style="margin-top: 10px;">
-                  <input type="text" class="form-control" ng-model="mailboxes.add.name" placeholder="Name" required/>
-                  <div class="input-group-addon">@{{ selectedDomain.domain }}</div>
-                </div>
+                <input type="text" class="form-control" ng-model="mailboxes.add.name" placeholder="Name" required autofocus autocomplete="off"/>
+                <div class="input-group-addon">@{{ selectedDomain.domain }}</div>
+              </div>
             </div>
           <div class="form-group">
             <label class="control-label">Owner</label>
@@ -67,7 +67,7 @@
           <input type="password" style="display: none;">
           <div class="form-group">
             <label class="control-label">Mailbox Owner</label>
-            <select class="form-control" ng-model="mailboxes.edit.mailbox.owner" ng-options="u.display for u in users track by u.id"></select>
+            <select class="form-control" ng-model="mailboxes.edit.mailbox.owner" ng-options="u.display for u in users track by u.id" autofocus></select>
           </div>
           <div class="form-group" ng-class="{ 'has-error': mailboxes.edit.error }">
             <label class="control-label">Aliases</label>
@@ -122,7 +122,7 @@
             <div class="control-label" ng-show="mailinglists.edit.error">
               <small>{{ mailinglists.edit.error.message }}</small>
             </div>
-            <multiselect ng-model="mailinglists.edit.list.members" options="name for name in mailinglists.availableMailboxNames" data-multiple="true"></multiselect>
+            <multiselect ng-model="mailinglists.edit.list.members" options="name for name in mailinglists.availableMailboxNames" data-multiple="true" autofocus></multiselect>
           </div>
           <input class="hide" type="submit" ng-disabled="mailinglistedit_form.$invalid || mailinglists.edit.busy"/>
         </form>
diff --git a/dashboard/src/views/email.js b/dashboard/src/views/email.js
index ee26263f8..404a18036 100644
--- a/dashboard/src/views/email.js
+++ b/dashboard/src/views/email.js
@@ -570,7 +570,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
     });
 
     // setup all the dialog focus handling
-    ['testEmailModal'].forEach(function (id) {
+    ['testEmailModal', 'mailboxAddModal', 'mailboxEditModal', 'mailinglistEditModal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
             $(this).find("[autofocus]:first").focus();
         });