Fixup validation of account username.

Change-Id: Ifb061a26c40775e5c547fc2f252ef7b0a8c6d776