Added verification in email construction