diff --git a/lib/SimpleSAML/Auth/Source.php b/lib/SimpleSAML/Auth/Source.php
index 349d097df7810f252812418a5523768f45984c0d..a695529197b261a524fb149ea8197504948cd551 100644
--- a/lib/SimpleSAML/Auth/Source.php
+++ b/lib/SimpleSAML/Auth/Source.php
@@ -1,5 +1,6 @@
 <?php
 
+use SimpleSAML\Auth\SourceFactory;
 
 /**
  * This class defines a base class for authentication source.
@@ -295,11 +296,26 @@ abstract class SimpleSAML_Auth_Source
 
         self::validateSource($config, $authId);
 
-        $className = SimpleSAML\Module::resolveClass($config[0], 'Auth_Source', 'SimpleSAML_Auth_Source');
-
+        $id = $config[0];
         $info = array('AuthId' => $authId);
+        $authSource = null;
+
         unset($config[0]);
-        return new $className($info, $config);
+
+        try {
+            // Check whether or not there's a factory responsible for instantiating our Auth Source instance
+            $factoryClass = SimpleSAML\Module::resolveClass($id, 'Auth_Source_Factory', SourceFactory::class);
+
+            /** @var SourceFactory $factory */
+            $factory = new $factoryClass;
+            $authSource = $factory->create($info, $config);
+        } catch (Exception $e) {
+            // If not, instantiate the Auth Source here
+            $className = SimpleSAML\Module::resolveClass($id, 'Auth_Source', 'SimpleSAML_Auth_Source');
+            $authSource = new $className($info, $config);
+        }
+
+        return $authSource;
     }
 
 
diff --git a/lib/SimpleSAML/Auth/SourceFactory.php b/lib/SimpleSAML/Auth/SourceFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..08ce87c1583cea93eb45b03d843f7b9fa5bfe507
--- /dev/null
+++ b/lib/SimpleSAML/Auth/SourceFactory.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace SimpleSAML\Auth;
+
+use SimpleSAML_Auth_Source;
+
+interface SourceFactory
+{
+    /**
+     * @param array $info
+     * @param array $config
+     * @return SimpleSAML_Auth_Source
+     */
+    public function create(array $info, array $config);
+}
\ No newline at end of file