Fix duplicate email send #6