Issue - 264 autogenerate email