Add ability to use a custom email address per user