This is going to be used to simplify the logic for client pages when they want to verify an email.

issue #349