Prevent users from becoming verified without a valid email address


(cherry picked from commit 0a38fceb)
3 jobs for cherry-pick-0a38fceb in 3 minutes and 3 seconds (queued for 4 seconds)
latest