Fix issue with hardcoded usernames

Change-Id: Ifddd3e3b571ef5b4da89ad2d9a45d16b4169dcd7
1 file changed