bugfix on update user
Merge branch 'master' into kingman