adding email form function
refactoring to cater for migration differences