More work done on the magic that is user invitations