Fix for non logged in state