Handle email verification and sign in

We can’t assume the user will complete email verification from the same
device/browser they initiated it.
Code tidy