Merge pull request #2400 from alphagov/fix-duplicate-user-bug-in-user… #1165

Job	Run time
Test Ruby	8m 33s
Lint JavaScript / Run Standardx	11s
Lint Ruby / Run RuboCop	16s
Lint SCSS / Run Stylelint	11s
Security Analysis / Run Brakeman	21s
Test JavaScript / Run Jasmine	1m 8s
	10m 40s

Provide feedback