Fixed issues with mebership provider