Make space adding more robust for logged out user.