Fix for when email does not exist.
Merge branch 'release/v0.7'