Bug ? - Move email verification code into separate module