Guests and invites now map correctly