Changed user name to user id