Email fixes
Merge pull request #476 from owdqa/email_public

Email fixes