Email Notifier Fix