diff --git a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java
index aaf00a4..69a5945 100644
--- a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java
+++ b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java
@@ -49,7 +49,7 @@ import java.util.List;
 @Configuration
 @EnableConfigurationProperties(OAuth2ClientProperties.class)
 @AutoConfigureBefore(ReactiveOAuth2ClientAutoConfiguration.class)
-@ConditionalOnClass(ClientRegistration.class)
+@ConditionalOnClass(name = "org.springframework.security.oauth2.client.registration.ClientRegistration")
 @Conditional(ClientsConfiguredCondition.class)
 public class CredHubOAuth2AutoConfiguration {
 
diff --git a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubTemplateAutoConfiguration.java b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubTemplateAutoConfiguration.java
index d3ffa70..ed35d66 100644
--- a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubTemplateAutoConfiguration.java
+++ b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubTemplateAutoConfiguration.java
@@ -95,7 +95,7 @@ public class CredHubTemplateAutoConfiguration {
 	 */
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnClass(WebClient.class)
+	@ConditionalOnClass(name = "org.springframework.web.reactive.function.client.WebClient")
 	public ReactiveCredHubOperations reactiveCredHubTemplate(
 			CredHubProperties credHubProperties, ClientOptions clientOptions,
 			@Autowired(required = false) ReactiveClientRegistrationRepository clientRegistrationRepository,