email bug fix
Merge branch 'feature/t694' into develop