Right, the util method to do that has been created, but I didn't go update the user creation stuff to use it, wasn't sure that was in the scope of the issue. I'll add it in.