How do I get email notification to work consistently with the right email addresses?