Added support for custom email forms