Task #1574 - fixing emails for other options