auto-invite improvements