diff --git a/support/cas-server-support-pac4j-webflow/src/main/java/org/apereo/cas/web/flow/config/DelegatedAuthenticationWebflowConfiguration.java b/support/cas-server-support-pac4j-webflow/src/main/java/org/apereo/cas/web/flow/config/DelegatedAuthenticationWebflowConfiguration.java
index <HASH>..<HASH> 100644
--- a/support/cas-server-support-pac4j-webflow/src/main/java/org/apereo/cas/web/flow/config/DelegatedAuthenticationWebflowConfiguration.java
+++ b/support/cas-server-support-pac4j-webflow/src/main/java/org/apereo/cas/web/flow/config/DelegatedAuthenticationWebflowConfiguration.java
@@ -149,6 +149,7 @@ public class DelegatedAuthenticationWebflowConfiguration implements CasWebflowEx
     }
 
     @RefreshScope
+    @ConditionalOnMissingBean(name = "clientAction")
     @Bean
     @Lazy
     public Action clientAction() {
@@ -188,6 +189,7 @@ public class DelegatedAuthenticationWebflowConfiguration implements CasWebflowEx
         return new Saml2ClientMetadataController(builtClients, configBean);
     }
 
+    @ConditionalOnMissingBean(name = "delegatedClientNavigationController")
     @Bean
     public DelegatedClientNavigationController delegatedClientNavigationController() {
         return new DelegatedClientNavigationController(builtClients, delegatedClientWebflowManager(), delegatedSessionCookieManager);
Conditional delegated authn beans (#<I>)

* Convert action and navigation controller beans to conditionals



* Revert back to the original bean name