Fix user-service problems