Corrected email notification to respect opting out of email/forcing email notification.