diff --git a/pac4j-module/src/main/java/net/unicon/shibui/pac4j/Pac4jConfiguration.java b/pac4j-module/src/main/java/net/unicon/shibui/pac4j/Pac4jConfiguration.java
index b7d1e05dd..1c28b1ee1 100644
--- a/pac4j-module/src/main/java/net/unicon/shibui/pac4j/Pac4jConfiguration.java
+++ b/pac4j-module/src/main/java/net/unicon/shibui/pac4j/Pac4jConfiguration.java
@@ -12,7 +12,6 @@
 public class Pac4jConfiguration {
     @Bean
     public Config config(final Pac4jConfigurationProperties pac4jConfigurationProperties) {
-        System.setProperty("skipPac4jOpenSAMLinit", "true");
         final SAML2ClientConfiguration saml2ClientConfiguration = new SAML2ClientConfiguration();
         saml2ClientConfiguration.setKeystorePath(pac4jConfigurationProperties.getKeystorePath());
         saml2ClientConfiguration.setKeystorePassword(pac4jConfigurationProperties.getKeystorePassword());
diff --git a/pac4j-module/src/main/java/net/unicon/shibui/pac4j/Pac4jSAMLConfigurationManager.java b/pac4j-module/src/main/java/net/unicon/shibui/pac4j/Pac4jSAMLConfigurationManager.java
new file mode 100644
index 000000000..dd3f0b10b
--- /dev/null
+++ b/pac4j-module/src/main/java/net/unicon/shibui/pac4j/Pac4jSAMLConfigurationManager.java
@@ -0,0 +1,13 @@
+package net.unicon.shibui.pac4j;
+
+import org.pac4j.saml.util.ConfigurationManager;
+
+import javax.annotation.Priority;
+
+@Priority(1)
+public class Pac4jSAMLConfigurationManager implements ConfigurationManager {
+    @Override
+    public void configure() {
+        // do nothing. we already configuration opensaml elsewhere
+    }
+}
diff --git a/pac4j-module/src/main/resources/META-INF/services/org.pac4j.saml.util.ConfigurationManager b/pac4j-module/src/main/resources/META-INF/services/org.pac4j.saml.util.ConfigurationManager
new file mode 100644
index 000000000..5289f3cb2
--- /dev/null
+++ b/pac4j-module/src/main/resources/META-INF/services/org.pac4j.saml.util.ConfigurationManager
@@ -0,0 +1 @@
+net.unicon.shibui.pac4j.Pac4jSAMLConfigurationManager
\ No newline at end of file