diff --git a/app/Libraries/EarcUtils.php b/app/Libraries/EarcUtils.php
index 2ff841bc9700dad6ec7a22c7a1b221c75f30629c..c3edce2834ef6c535b9ba726d6135cb034dfb661 100755
--- a/app/Libraries/EarcUtils.php
+++ b/app/Libraries/EarcUtils.php
@@ -104,8 +104,7 @@ class EarcUtils
     public static function getIdpMetadata($entityid)
     {
         $metaloader = new MetaLoader(null);
-        // The entity ID must not be url encoded for SSP library to loaded from URL source.
-        $metaloader->loadSource(array('src' => $entityid));
+        $metaloader->loadSource(array('src' => config('app.metadata_url') . urlencode($entityid)));
         $metaloader->writeMetadataFiles(Configuration::getInstance()->getPathValue('metadatagenerateddir', 'metadata-generated-idp/'));
 
         include Configuration::getInstance()->getPathValue('metadatagenerateddir', 'metadata-generated-idp/').'saml20-idp-remote.php';