Quick fix for email bug.  Will need a cleanup later.