GPII-1036: Adding back in the username