Changed username from user name to user id