[master] A couple username creation changes