refactor

UserRest fix