Automated Email fix