*8787* Improve user creation script robustness