diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml
index f168690..646ab63 100755
--- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-broker-saml">
<resources>
<!-- Insert resources here -->
@@ -10,6 +8,6 @@
<module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-model-api"/>
<module name="org.keycloak.keycloak-broker-core"/>
+ <module name="org.picketlink.common"/>
</dependencies>
-
</module>
diff --git a/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java b/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java
index dc03c49..89146fc 100755
--- a/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java
+++ b/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java
@@ -50,7 +50,7 @@ public class DefaultKeycloakSessionFactory implements KeycloakSessionFactory {
public void init() {
ProviderManager pm = new ProviderManager(getClass().getClassLoader(), Config.scope().getArray("providers"));
- for (Spi spi : ServiceLoader.load(Spi.class)) {
+ for (Spi spi : ServiceLoader.load(Spi.class, getClass().getClassLoader())) {
Map<String, ProviderFactory> factories = new HashMap<String, ProviderFactory>();
factoriesMap.put(spi.getProviderClass(), factories);