Fix for semi logged out state
Be more gentle when in non logged in states