diff --git a/src/views/email.html b/src/views/email.html
index 4d88519d3..04555707b 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -434,7 +434,7 @@
               </div>
             </div>
 
-            <div class="row" ng-show="mailRelay.preset.provider !== 'cloudron-smtp' && mailRelay.preset.provider !== 'noop'">
+            <div class="row" ng-show="usesExternalServer(mailRelay.preset.provider)">
               <div class="col-md-6">
                 <div>
                   <form name="mailRelayForm" role="form" ng-submit="mailRelay.submit()" autocomplete="off" novalidate>
@@ -454,29 +454,29 @@
                     </div>
 
                     <!-- Postmark and Sendgrid -->
-                    <div ng-show="isProvider('postmark-smtp') || isProvider('sendgrid-smtp')" class="form-group" ng-class="{ 'has-error': (mailRelayForm.serverApiToken.$dirty && mailRelayForm.serverApiToken.$invalid) }">
+                    <div ng-show="usesTokenAuth(mailRelay.relay.provider)" class="form-group" ng-class="{ 'has-error': (mailRelayForm.serverApiToken.$dirty && mailRelayForm.serverApiToken.$invalid) }">
                       <label class="control-label">API Token/Key</label>
                       <div class="control-label" ng-show="(!mailRelayForm.serverApiToken.$dirty && mailRelay.error.serverApiToken) || (mailRelayForm.serverApiToken.$dirty && mailRelayForm.serverApiToken.$invalid)">
                         <small ng-show="!mailRelayForm.serverApiToken.$dirty && mailRelay.error.serverApiToken">{{ mailRelay.error.serverApiToken }}</small>
                       </div>
-                      <input type="text" class="form-control" ng-model="mailRelay.relay.serverApiToken" name="serverApiToken" ng-required="isProvider('postmark-smtp') || isProvider('sendgrid-smtp')">
+                      <input type="text" class="form-control" ng-model="mailRelay.relay.serverApiToken" name="serverApiToken" ng-required="usesTokenAuth(mailRelay.relay.provider)">
                     </div>
 
                     <!-- Other -->
-                    <div ng-show="!isProvider('postmark-smtp') && !isProvider('sendgrid-smtp')" class="form-group" ng-class="{ 'has-error': (mailRelayForm.username.$dirty && mailRelayForm.username.$invalid) }">
+                    <div ng-show="usesPasswordAuth(mailRelay.relay.provider)" 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) || (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" ng-required="!isProvider('postmark-smtp') && !isProvider('sendgrid-smtp')">
+                      <input type="text" class="form-control" ng-model="mailRelay.relay.username" name="username" ng-required="usesPasswordAuth(mailRelay.relay.provider)">
                     </div>
 
-                    <div ng-show="!isProvider('postmark-smtp') && !isProvider('sendgrid-smtp')" class="form-group" ng-class="{ 'has-error': (mailRelayForm.password.$dirty && mailRelayForm.password.$invalid) }">
+                    <div ng-show="usesPasswordAuth(mailRelay.relay.provider)" 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) || (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" ng-required="!isProvider('postmark-smtp') && !isProvider('sendgrid-smtp')">
+                      <input type="password" class="form-control" ng-model="mailRelay.relay.password" name="password" ng-required="usesPasswordAuth(mailRelay.relay.provider)">
                     </div>
 
                     <input class="ng-hide" type="submit" ng-disabled="mailRelayForm.$invalid"/>
@@ -487,7 +487,7 @@
 
             <div class="row">
               <div class="col-md-12">
-                <button class="btn btn-primary" ng-click="mailRelay.submit()" ng-disabled="(mailRelay.preset.provider !== 'cloudron-smtp' && mailRelay.preset.provider !== 'noop' && (!mailRelayForm.$dirty || mailRelayForm.$invalid)) || mailRelay.busy"><i class="fa fa-circle-notch fa-spin" ng-show="mailRelay.busy"></i> Save</button>
+                <button class="btn btn-primary" ng-click="mailRelay.submit()" ng-disabled="(usesExternalServer(mailRelay.preset.provider) && (!mailRelayForm.$dirty || mailRelayForm.$invalid)) || mailRelay.busy"><i class="fa fa-circle-notch fa-spin" ng-show="mailRelay.busy"></i> Save</button>
 
                 <span class="has-error text-center" ng-show="mailRelay.error">{{ mailRelay.error }}</span>
                 <span class="text-success text-center text-bold" ng-show="mailRelay.success">Saved</span>
diff --git a/src/views/email.js b/src/views/email.js
index a0b25c470..e90044cc9 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -41,8 +41,16 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         $('.modal').modal('hide');
     };
 
-    $scope.isProvider = function (provider) {
-        return $scope.mailRelay.relay.provider === provider;
+    $scope.usesTokenAuth = function (provider) {
+        return provider === 'postmark-smtp' || provider === 'sendgrid-smtp';
+    };
+
+    $scope.usesExternalServer = function (provider) {
+        return provider !== 'cloudron-smtp' && provider !== 'noop';
+    };
+
+    $scope.usesPasswordAuth = function (provider) {
+        return provider !== 'postmark-smtp' && provider !== 'sendgrid-smtp';
     };
 
     $scope.catchall = {