diff --git a/src/views/email.js b/src/views/email.js
index e90044cc9..7a32e50b3 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -41,18 +41,6 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         $('.modal').modal('hide');
     };
 
-    $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 = {
         mailboxes: [],
         busy: false,
@@ -391,6 +379,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
     $scope.mailRelayPresets = [
         { provider: 'cloudron-smtp', name: 'Built-in SMTP server' },
         { provider: 'external-smtp', name: 'External SMTP server', host: '', port: 587 },
+        { provider: 'external-smtp-noauth', name: 'External SMTP server (No Authentication)', host: '', port: 587 },
         { provider: 'ses-smtp', name: 'Amazon SES', host: 'email-smtp.us-east-1.amazonaws.com', port: 587 },
         { provider: 'google-smtp', name: 'Google', host: 'smtp.gmail.com', port: 587 },
         { provider: 'mailgun-smtp', name: 'Mailgun', host: 'smtp.mailgun.org', port: 587 },
@@ -400,6 +389,22 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         { provider: 'noop', name: 'Disable' },
     ];
 
+    $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 === 'external-smtp'
+            || provider === 'ses-smtp'
+            || provider === 'google-smtp'
+            || provider === 'mailgun-smtp'
+            || provider === 'mailjet-smtp';
+    };
+
     $scope.mailRelay = {
         error: null,
         success: false,