refactor user to username