Fix blank emails

Closes #364