Fix user serivce