diff --git a/src/views/app.html b/src/views/app.html
index 91660c896..9dba5aaee 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -1030,7 +1030,7 @@
                     <div class="has-error" ng-show="email.error.inboxName">{{ email.error.inboxName }}</div>
 
                     <div class="input-group form-inline" ng-class="{ 'has-error': !inboxForm.inboxName.$dirty && email.error.inboxName }">
-                      <input type="text" class="form-control" name="inboxName" ng-model="email.inboxName">
+                      <input type="text" ng-required="email.enableInbox === '1'" class="form-control" name="inboxName" ng-model="email.inboxName">
 
                       <div class="input-group-btn">
                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -1065,7 +1065,7 @@
         <div class="row" ng-show="app.manifest.addons.recvmail">
           <div class="col-md-12 text-right">
             <br/>
-            <button class="btn btn-outline btn-primary pull-right" ng-click="email.submitInbox()" ng-disabled="(app.enableInbox === email.enableInbox && email.currentInboxDomainName === email.inboxDomain.domain && email.currentInboxName === email.inboxName) || email.busy || app.error || app.taskId" tooltip-enable="app.error || app.taskId" uib-tooltip="{{ app.error ? 'App is in error state' : 'App is busy' }}">
+            <button class="btn btn-outline btn-primary pull-right" ng-click="email.submitInbox()" ng-disabled="inboxForm.$invalid || (app.enableInbox === email.enableInbox && email.currentInboxDomainName === email.inboxDomain.domain && email.currentInboxName === email.inboxName) || email.busy || app.error || app.taskId" tooltip-enable="app.error || app.taskId" uib-tooltip="{{ app.error ? 'App is in error state' : 'App is busy' }}">
               <i class="fa fa-circle-notch fa-spin" ng-show="email.busy"></i> {{ 'app.email.from.saveAction' | tr }}
             </button>
           </div>