Fix a few more bugs with OS user creation