Replace custom code with CredentialResolver.