Bugfix - white usernames

Change-Id: I9441cf649239abf4c1e1b093a66a14ceab7eb0fb
Merge "Bugfix - white usernames"