Fix Email Notification