Fix user provider issues