Use user's normalized name everywhere

Bug: 64412
Change-Id: Ifbe3526c1b1d141f3d1f6c56ba285c191a587ff9