Also ensure username doesn't conflict.

Change-Id: If067cefaf88bda9dbe19193767c56a243bf4ff98