added temp fix for logout-relogin issue