Revert "Skip the user email validation step."

This reverts commit 6adb368735f45aa0a36d87903768939c69ef34cb.