(NotificationsEmails) Changes from self-review