change the way of injecting the username