fixed bug when saving user with extra data
Merge branch 'origin/master'