Little User Service Refactor