User service + fix