Email Notification Bug Fix