TEST-18 #resolve changing username to user

Test Plan: test

Reviewers: albertkang

Differential Revision: http://178.62.60.45/D37