diff --git a/src/routes/test/settings-test.js b/src/routes/test/settings-test.js
index 7fb7b5e2d..ae32d3336 100644
--- a/src/routes/test/settings-test.js
+++ b/src/routes/test/settings-test.js
@@ -816,7 +816,7 @@ describe('Settings API', function () {
                 expect(res.body.dns.ptr.status).to.eql(false);
                 // expect(res.body.ptr.value).to.eql(null); this will be anything random
 
-                expect(res.body.outboundPort25).to.be.an('object');
+                expect(res.body.relay).to.be.an('object');
 
                 done();
             });
diff --git a/src/settings.js b/src/settings.js
index 7bf73812e..4a000037a 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -165,7 +165,7 @@ function getEmailStatus(callback) {
 
     var digOptions = { server: '127.0.0.1', port: 53, timeout: 5000 };
 
-    var records = {}, outboundPort25 = {};
+    var records = {}, relay = {};
 
     var dkimKey = cloudron.readDkimPublicKeySync();
     if (!dkimKey) return callback(new SettingsError(SettingsError.INTERNAL_ERROR, new Error('Failed to read dkim public key')));
@@ -310,7 +310,7 @@ function getEmailStatus(callback) {
             'outgoing.verizon.net'
         ]);
 
-        outboundPort25 = {
+        relay = {
             value: 'OK',
             status: false
         };
@@ -319,20 +319,20 @@ function getEmailStatus(callback) {
         client.setTimeout(5000);
         client.connect(25, smtpServer);
         client.on('connect', function () {
-            outboundPort25.status = true;
-            outboundPort25.value = 'OK';
+            relay.status = true;
+            relay.value = 'OK';
             client.destroy(); // do not use end() because it still triggers timeout
             callback();
         });
         client.on('timeout', function () {
-            outboundPort25.status = false;
-            outboundPort25.value = 'Connect to ' + smtpServer + ' timed out';
+            relay.status = false;
+            relay.value = 'Connect to ' + smtpServer + ' timed out';
             client.destroy();
             callback(new Error('Timeout'));
         });
         client.on('error', function (error) {
-            outboundPort25.status = false;
-            outboundPort25.value = 'Connect to ' + smtpServer + ' failed: ' + error.message;
+            relay.status = false;
+            relay.value = 'Connect to ' + smtpServer + ' failed: ' + error.message;
             client.destroy();
             callback(error);
         });
@@ -356,7 +356,7 @@ function getEmailStatus(callback) {
         ignoreError('ptr', checkPtr),
         ignoreError('port25', checkOutbound25)
     ], function () {
-        callback(null, { dns: records, outboundPort25: outboundPort25 } );
+        callback(null, { dns: records, relay: relay } );
     });
 }
 
diff --git a/webadmin/src/js/main.js b/webadmin/src/js/main.js
index 915c23434..dba470704 100644
--- a/webadmin/src/js/main.js
+++ b/webadmin/src/js/main.js
@@ -150,7 +150,7 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
                 Client.getEmailStatus(function (error, result) {
                     if (error) return console.error(error);
 
-                    if (!result.dns.spf.status || !result.dns.dkim.status || !result.dns.ptr.status || !result.outboundPort25.status) {
+                    if (!result.dns.spf.status || !result.dns.dkim.status || !result.dns.ptr.status || !result.relay.status) {
                         var actionScope = $scope.$new(true);
                         actionScope.action = '/#/email';
 
diff --git a/webadmin/src/views/email.html b/webadmin/src/views/email.html
index 86e49f0db..fd5084def 100644
--- a/webadmin/src/views/email.html
+++ b/webadmin/src/views/email.html
@@ -192,15 +192,15 @@
             <div class="row">
                 <div class="col-xs-12">
                     <p class="text-muted">
-                        <i ng-class="outboundPort25.status ? 'fa fa-check-circle text-success' : 'fa fa-exclamation-triangle text-danger'"></i> &nbsp;
+                        <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)
                         </a>
-                        <button class="btn btn-xs btn-default" ng-click="email.refresh()" ng-disabled="email.refreshBusy" ng-show="!outboundPort25.status"><i class="fa fa-refresh" ng-class="{ 'fa-pulse': email.refreshBusy }"></i></button>
+                        <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>
                     <div id="collapse_dns_port" class="panel-collapse collapse">
                         <div class="panel-body">
-                            <p><b> {{ outboundPort25.value }} </b> </p>
+                            <p><b> {{ relay.value }} </b> </p>
                         </div>
                     </div>
                 </div>
diff --git a/webadmin/src/views/email.js b/webadmin/src/views/email.js
index dcef4d365..15a8308ca 100644
--- a/webadmin/src/views/email.js
+++ b/webadmin/src/views/email.js
@@ -7,7 +7,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
     $scope.user = Client.getUserInfo();
     $scope.config = Client.getConfig();
     $scope.dnsConfig = {};
-    $scope.outboundPort25 = {};
+    $scope.relay = {};
     $scope.expectedDnsRecords = {};
     $scope.expectedDnsRecordsTypes = [
         { name: 'MX', value: 'mx' },
@@ -175,7 +175,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             if (error) return callback(error);
 
             $scope.expectedDnsRecords = result.dns;
-            $scope.outboundPort25 = result.outboundPort25;
+            $scope.relay = result.relay;
 
             // open the record details if they are not correct
             for (var type in $scope.expectedDnsRecords) {
@@ -184,7 +184,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
                 }
             }
 
-            if (!$scope.outboundPort25.status) {
+            if (!$scope.relay.status) {
                 $('#collapse_dns_port').collapse('show');
             }