1 files changed, 2 insertions, 2 deletions
diff --git a/www/js/app.js b/www/js/app.js
index b5f1b804..abe2b0bd 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1751,7 +1751,7 @@ angular.module('zmApp', [
 
 
        
-        if (NVRDataModel.hasLoginInfo() || toState.data.requireLogin == false) {
+        if ((NVRDataModel.hasLoginInfo() || toState.data.requireLogin == false) && toState.name != "app.invalidapi" && toState.name != "app.refresh")  {
           //console.log("State transition is authorized");
           NVRDataModel.debug ("Setting last-desktop-state to:"+JSON.stringify(toState));
           localforage.setItem('last-desktop-state', {
@@ -1766,7 +1766,7 @@ angular.module('zmApp', [
           // 
 
           $rootScope.dpadState = "login";
-          $state.transitionTo('login');
+          $state.transitionTo('app.login');
 
         }