thingsboard-aplcache

diff --git a/ui/src/app/api/user.service.js b/ui/src/app/api/user.service.js
index 1785582..57486b0 100644
--- a/ui/src/app/api/user.service.js
+++ b/ui/src/app/api/user.service.js
@@ -339,6 +339,7 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, logi
                     updateAndValidateToken(refreshToken, 'refresh_token', false);
                     procceedJwtTokenValidate();
                 }, function fail() {
+                    $location.search('publicId', null);
                     deferred.reject();
                 });
             } else {

diff --git a/ui/src/app/app.run.js b/ui/src/app/app.run.js
index a9250e0..2ab5fe2 100644
--- a/ui/src/app/app.run.js
+++ b/ui/src/app/app.run.js
@@ -111,7 +111,10 @@ export default function AppRun($rootScope, $window, $injector, $location, $log, 
                         }
                     }
                 } else {
-                    if (to.module === 'private') {
+                    if (publicId && publicId.length > 0) {
+                        evt.preventDefault();
+                        reloadUserFromPublicId();
+                    } else if (to.module === 'private') {
                         evt.preventDefault();
                         if (to.url === '/home' || to.url === '/') {
                             $state.go('login', params);