diff --git a/src/views/email.html b/src/views/email.html
index 0a401d1bb..ea37240e6 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -125,7 +125,7 @@
             <div class="row" ng-repeat="alias in mailboxes.edit.aliases | orderBy:'reversedSortingNotation'">
               <div class="col col-lg-11">
                 <div class="input-group">
-                  <input type="text" class="form-control input-sm" ng-model="alias.name">
+                  <input type="text" class="form-control input-sm" ng-model="alias.name" autofocus>
 
                   <div class="input-group-btn">
                     <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
@@ -252,7 +252,7 @@
           <div class="form-group" ng-class="{ 'has-error': mailinglists.edit.error.members }">
             <label class="control-label">{{ 'email.addMailinglistDialog.members' | tr }}</label><br/>
             <div class="has-error control-label" ng-show="mailinglists.edit.error.members"><small>{{ mailinglists.edit.error.members }}</small></div>
-            <textarea ng-model="mailinglists.edit.membersTxt" class="form-control" rows="5"></textarea>
+            <textarea ng-model="mailinglists.edit.membersTxt" class="form-control" rows="5" autofocus></textarea>
             <small>{{ 'email.addMailinglistDialog.membersInfo' | tr }}</small>
           </div>
           <div class="checkbox">