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

@jrgm and @6a68 - can you two review this? This fixes 3172 on dev.

fixes #3172