Ensure the userid is set after completing any sort of address verification.
Merge pull request #3177 from mozilla/issue_3172_add_email_stage_fix

Ensure the userid is set after completing any sort of address verification.