#810 - update to double email verification