Fixes for user creation