This adds an option to use alternate addresses as well, and makes sure
 the order in which email fields are checked is consistent for users
 and managers

issue #5756