Fix for semi logged out state