pull some changes in UserManager