Email Notification changes