diff --git a/dashboard/src/views/email.html b/dashboard/src/views/email.html
index 9e999ef2b..2e8a785d1 100644
--- a/dashboard/src/views/email.html
+++ b/dashboard/src/views/email.html
@@ -28,7 +28,7 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Edit mailbox {{ mailboxes.edit.name }}@{{selectedDomain.domain}}</h4>
+        <h4 class="modal-title">Edit mailbox {{ mailboxes.edit.mailbox.name }}@{{selectedDomain.domain}}</h4>
       </div>
       <div class="modal-body">
         <form name="mailboxedit_form" role="form" ng-submit="mailboxes.edit.submit()" autocomplete="off">
@@ -40,9 +40,12 @@
           <div class="form-group" ng-class="{ 'has-error': mailboxes.edit.error }">
             <label class="control-label">Aliases</label>
             <div class="control-label" ng-show="mailboxes.edit.error">
-              <small>{{ mailboxes.edit.error }}</small>
+              <small>{{ mailboxes.edit.error.message }}</small>
+            </div>
+            <div class="input-group form-inline" style="margin-top: 10px;">
+              <tag-input class="form-group form-control" placeholder="Add alias" taglist="mailboxes.edit.mailbox.aliases" name="aliases"></tag-input>
+              <div class="input-group-addon">@{{ selectedDomain.domain }}</div>
             </div>
-            <tag-input placeholder="add alias" taglist="mailboxes.edit.mailbox.aliases" name="aliases"></tag-input>
           </div>
           <input class="hide" type="submit" ng-disabled="mailboxedit_form.$invalid || mailboxes.edit.busy"/>
         </form>