updated userManager & User
updated userManager & User