Fixes to user creation logic...