bug fix when saving user status
Merge branch 'master'