Fix regression with segment.
Fix segment for production.
Fix verify email regression.