Added a name field in the email as well