Handle username conflict when changing email

[#76898458] https://www.pivotaltracker.com/story/show/76898458

Signed-off-by: Rob Gallagher <rgallagher@pivotallabs.com>