[1.3] [1.4] Fix failure in email tests