User Service Fix