diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index a39da144fd..5e871e86e4 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -44,7 +44,6 @@ var Dashboard = {
 
     isConnectMode: function () {
 
-        return true;
         if (Dashboard.isRunningInCordova()) {
             return true;
         }
@@ -57,7 +56,6 @@ var Dashboard = {
 
     isRunningInCordova: function () {
 
-        return true;
         return window.appMode == 'cordova';
     },
 
@@ -1309,7 +1307,7 @@ var Dashboard = {
 
     isServerlessPage: function () {
         var url = getWindowUrl().toLowerCase();
-        return url.indexOf('connectlogin.html') != -1 || url.indexOf('selectserver.html') != -1;
+        return url.indexOf('connectlogin.html') != -1 || url.indexOf('selectserver.html') != -1 || url.indexOf('login.html') != -1 || url.indexOf('forgotpassword.html') != -1 || url.indexOf('forgotpasswordpin.html') != -1;
     },
 
     capabilities: function () {