diff --git a/src/email.js b/src/email.js
index 04266f842..33ae22d42 100644
--- a/src/email.js
+++ b/src/email.js
@@ -103,7 +103,7 @@ function checkSmtpRelay(relay, callback) {
     }));
 
     transporter.verify(function(error) {
-        result.status = !!error;
+        result.status = !error;
         if (error) {
             result.value = error.message;
             return callback(error, result);
diff --git a/src/platform.js b/src/platform.js
index 9ef5f71ba..8a3d26272 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -260,7 +260,7 @@ function createMailConfig(callback) {
             settings.getMailRelay(function (error, relay) {
                 if (error) return callback(error);
 
-                const enabled = relay.provider === 'cloudron-smtp' ? true : false,
+                const enabled = relay.provider !== 'cloudron-smtp' ? true : false,
                       host = relay.host || '',
                       port = relay.port || 25,
                       tls = !!relay.tls, // Whether to connect with TLS (not STARTTLS)
diff --git a/webadmin/src/views/email.html b/webadmin/src/views/email.html
index fd5084def..5f3ef7f91 100644
--- a/webadmin/src/views/email.html
+++ b/webadmin/src/views/email.html
@@ -194,7 +194,7 @@
                     <p class="text-muted">
                         <i ng-class="relay.status ? 'fa fa-check-circle text-success' : 'fa fa-exclamation-triangle text-danger'"></i> &nbsp;
                         <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#collapse_dns_port">
-                            Outbound SMTP (Port 25)
+                            Outbound SMTP
                         </a>
                         <button class="btn btn-xs btn-default" ng-click="email.refresh()" ng-disabled="email.refreshBusy" ng-show="!relay.status"><i class="fa fa-refresh" ng-class="{ 'fa-pulse': email.refreshBusy }"></i></button>
                     </p>
diff --git a/webadmin/src/views/email.js b/webadmin/src/views/email.js
index 15a8308ca..5679753f7 100644
--- a/webadmin/src/views/email.js
+++ b/webadmin/src/views/email.js
@@ -86,12 +86,12 @@ 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, tls: false },
-        { provider: 'ses-smtp', name: 'Amazon SES', host: 'email-smtp.us-east-1.amazonaws.com', port: 25, tls: false },
-        { provider: 'google-smtp', name: 'Google', host: 'smtp.gmail.com', port: 587, tls: false },
-        { provider: 'mailgun-smtp', name: 'Mailgun', host: 'smtp.mailgun.org', port: 587, tls: false },
-        { provider: 'postmark-smtp', name: 'Postmark', host: 'smtp.postmarkapp.com', port: 587, tls: false },
-        { provider: 'sendgrid-smtp', name: 'SendGrid', host: 'smtp.sendgrid.net', port: 587, tls: false },
+        { provider: 'external-smtp', name: 'External SMTP server', 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 },
+        { provider: 'postmark-smtp', name: 'Postmark', host: 'smtp.postmarkapp.com', port: 587 },
+        { provider: 'sendgrid-smtp', name: 'SendGrid', host: 'smtp.sendgrid.net', port: 587 },
     ];
 
     $scope.mailRelay = {