Updating user service to be optional