diff --git a/app/index.js b/app/index.js
index f54aea0..f799e29 100644
--- a/app/index.js
+++ b/app/index.js
@@ -66,7 +66,8 @@
            $rootScope.$on('$locationChangeSuccess', function(event){
                var path = $location.path();
                dataService.path = path;
-               if(['/','/login','/logout'].indexOf(path) == -1){
+               if(['/','/login','/logout'].indexOf(path) == -1 &&
+                path.indexOf('/login') == -1){
                    dataService.showNavigation = true;
                }else{
                    dataService.showNavigation = false;
@@ -74,6 +75,10 @@
            });
 
            $rootScope.$on('timedout-user', function(){
+             if(sessionStorage.getItem('LOGIN_ID') == 'FAKE_ID'){
+                return;
+             }
+
              sessionStorage.removeItem('LOGIN_ID');
              $location.path('/login');
            });