Redo to method of creating a username for each user
fixes merge conflict