All emails now sending correctly