Udpated instances of plain_email to email