diff --git a/webadmin/src/js/setup.js b/webadmin/src/js/setup.js
index d129207a7..23a2eb82b 100644
--- a/webadmin/src/js/setup.js
+++ b/webadmin/src/js/setup.js
@@ -61,7 +61,7 @@ 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 && status.configState.domain !== window.location.hostname) {
+        if (status.provider !== 'caas' && status.configState.domain && ('my.' + status.configState.domain) !== window.location.hostname) {
             window.location.href = 'https://my.' + status.configState.domain + '/setup.html';
             return;
         }