Refactor current user provider.