Added username and refactor in user task