Re-work handling of email notifications settings.