Fixed creation of new users
Merge branch 'fix_new_user'