Improved and changed user creation

Improved and changed user creation