Bug 796393 - [email] duplicate accounts can be created

This has r+ from @asutherland. Thanks also to @praveen.singapati for helping with this change.