User Provider fix