more changes to user service