diff --git a/webadmin/src/js/setup.js b/webadmin/src/js/setup.js
index 23a2eb82b..c9e36be8a 100644
--- a/webadmin/src/js/setup.js
+++ b/webadmin/src/js/setup.js
@@ -61,8 +61,8 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope
         }
 
         // if we are here from the ip first go to the real domain if already setup
-        if (status.provider !== 'caas' && status.configState.domain && ('my.' + status.configState.domain) !== window.location.hostname) {
-            window.location.href = 'https://my.' + status.configState.domain + '/setup.html';
+        if (status.provider !== 'caas' && status.adminFqdn && status.adminFqdn !== window.location.hostname) {
+            window.location.href = 'https://my.' + status.adminFqdn + '/setup.html';
             return;
         }
 
@@ -72,7 +72,7 @@ app.controller('SetupController', ['$scope', '$http', 'Client', function ($scope
         }
 
         // if we don't have a domain yet, first go to domain setup
-        if (!status.configState.domain) {
+        if (!status.adminFqdn) {
             window.location.href = '/setupdns.html';
             return;
         }