Change user creation scripts to use usernames