diff --git a/src/views/email.html b/src/views/email.html
index 8f0e15921..4d88519d3 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -463,20 +463,20 @@
                     </div>
 
                     <!-- Other -->
-                    <div ng-show="!isProvider('postmark-smtp') && !isProvider('sendgrid-smtp')" class="form-group" ng-class="{ 'has-error': (!mailRelayForm.username.$dirty && mailRelay.error.username) }">
+                    <div ng-show="!isProvider('postmark-smtp') && !isProvider('sendgrid-smtp')" class="form-group" ng-class="{ 'has-error': (mailRelayForm.username.$dirty && mailRelayForm.username.$invalid) }">
                       <label class="control-label">Username</label>
-                      <div class="control-label" ng-show="!mailRelayForm.username.$dirty && mailRelay.error.username">
-                        <small>{{ mailRelay.error.username }}</small>
+                      <div class="control-label" ng-show="(!mailRelayForm.username.$dirty && mailRelay.error.username) || (mailRelayForm.username.$dirty && mailRelayForm.username.$invalid)">
+                        <small ng-show="!mailRelayForm.username.$dirty && mailRelay.error.username">{{ mailRelay.error.username }}</small>
                       </div>
-                      <input type="text" class="form-control" ng-model="mailRelay.relay.username" name="username">
+                      <input type="text" class="form-control" ng-model="mailRelay.relay.username" name="username" ng-required="!isProvider('postmark-smtp') && !isProvider('sendgrid-smtp')">
                     </div>
 
-                    <div ng-show="!isProvider('postmark-smtp') && !isProvider('sendgrid-smtp')" class="form-group" ng-class="{ 'has-error': (!mailRelayForm.password.$dirty && mailRelay.error.password) }">
+                    <div ng-show="!isProvider('postmark-smtp') && !isProvider('sendgrid-smtp')" class="form-group" ng-class="{ 'has-error': (mailRelayForm.password.$dirty && mailRelayForm.password.$invalid) }">
                       <label class="control-label">Password</label>
-                      <div class="control-label" ng-show="!mailRelayForm.password.$dirty && mailRelay.error.password">
-                        <small>{{ mailRelay.error.password }}</small>
+                      <div class="control-label" ng-show="(!mailRelayForm.password.$dirty && mailRelay.error.password) || (mailRelayForm.password.$dirty && mailRelayForm.password.$invalid)">
+                        <small ng-show="!mailRelayForm.password.$dirty && mailRelay.error.password">{{ mailRelay.error.password }}</small>
                       </div>
-                      <input type="password" class="form-control" ng-model="mailRelay.relay.password" name="password">
+                      <input type="password" class="form-control" ng-model="mailRelay.relay.password" name="password" ng-required="!isProvider('postmark-smtp') && !isProvider('sendgrid-smtp')">
                     </div>
 
                     <input class="ng-hide" type="submit" ng-disabled="mailRelayForm.$invalid"/>