Bug fixes

Reworked user/provider services.