Repair missed conversion to new username lookup

Change-Id: Ib79a13da59c79db54fbd24ef3837db1b5ff6a7d0
Merge "Repair missed conversion to new username lookup"