Fix bug on add user
Fix bug on add user
Fix bug on add user
Fix bug on add user
Fix bug on add user
Fix bug on add user
Merge pull request #48 from zoic21/master

Merge from master