Add a couple of extra email steps