diff --git a/webadmin/src/js/main.js b/webadmin/src/js/main.js index 2ffff27b0..37aaf688a 100644 --- a/webadmin/src/js/main.js +++ b/webadmin/src/js/main.js @@ -70,23 +70,16 @@ angular.module('Application').controller('MainController', ['$scope', '$route', }; function runConfigurationChecks() { - - // Check if all email DNS records are set up properly - Client.getMailConfig(function (error, mailConfig) { + Client.getExpectedDnsRecords(function (error, result) { if (error) return console.error(error); - if (!mailConfig.enabled) return; - Client.getExpectedDnsRecords(function (error, result) { - if (error) return console.error(error); + if (!result.spf.status || !result.dkim.status) { + var actionScope = $scope.$new(true); + actionScope.action = '/#/settings'; - if (!result.spf.status || !result.dkim.status) { - var actionScope = $scope.$new(true); - actionScope.action = '/#/settings'; - - Client.notify('DNS Configuration', 'Please setup all required DNS records to guarantee correct mail delivery', true, 'info', actionScope); - } - }); + Client.notify('DNS Configuration', 'Please setup all required DNS records to guarantee correct mail delivery', true, 'info', actionScope); + } }); }