Add make_email helper