bug fix when updating user informations
Merge origin/master