More minor prep for user creation