fix some issue about users
merge from origin