Refactor user name to user identifier ace 83