Fix selected provider persistence