Fix for behaviour with new email extraction algorithm
Better handling of email addresses
Fixed request wording
Eliminate warning
Handle alternate email addresses
Better handling of role options in some cases