Changing approach such that email activation is not a step.