Fix a bug creating new users
Merge branch 'new_user_fix'

* new_user_fix:
  Fix a bug creating new users