fixed username/email ambiguity