Incorrect message on user creation.
Merge branch 'origin/develop'