Make email unique
Merge branch 'step1' into step2