fix functions
User service