Clean up and possibly fix user creation.

We haven't seen it failing, but this looks more stable.