User, UserManager updated