diff --git a/dashboard/src/js/client.js b/dashboard/src/js/client.js
index fbbbf8b18..5ee82d5b7 100644
--- a/dashboard/src/js/client.js
+++ b/dashboard/src/js/client.js
@@ -458,7 +458,7 @@ angular.module('Application').filter('tr', translateFilterFactory);
 //    activated
 //    adminFqn
 // }
-// returns true if redirected
+// returns true if redirected . currentView is one of dashboard/restore/setup/activation
 function redirectIfNeeded(status, currentView) {
     var search = decodeURIComponent(window.location.search).slice(1).split('&').map(function (item) { return item.split('='); }).reduce(function (o, k) { o[k[0]] = k[1]; return o; }, {});
 
@@ -482,7 +482,7 @@ function redirectIfNeeded(status, currentView) {
 
             return false;
         }
-        window.location.href = '/';
+        window.location.href = 'https://' + status.adminFqdn + '/';
         return true;
     }
 
@@ -512,6 +512,11 @@ function redirectIfNeeded(status, currentView) {
         return true;
     }
 
+    if (currentView === 'dashboard') {
+        window.location.href = '/setup.html' + window.location.search;
+        return true;
+    }
+
     // if we are here, proceed with current view
     return false;
 }