Improvements to multi-add-user feature

And if they sign up for an account or edit their account settings.