Fix breaking change from UserService