#JC-1305. Adding user to Registered only after activation.
Merge branch 'develop.JC1305' into develop