Fixed bug in user create.
Merge branch 'test' into dev