verify email in zamboni first (bug 1077116)
Merge pull request #2651 from andymckay/1077116

verify email in zamboni first