diff --git a/modules/core/www/loginuserpass.php b/modules/core/www/loginuserpass.php
index 44a1ae30bcc2e0f3a0e0c30e7b003c02b7461b32..4e41a13053a0559de93abb2eca2c2ffedc3871af 100644
--- a/modules/core/www/loginuserpass.php
+++ b/modules/core/www/loginuserpass.php
@@ -63,6 +63,13 @@ if (array_key_exists('forcedUsername', $state)) {
 }
 $t->data['links'] = $source->getLoginLinks();
 $t->data['errorcode'] = $errorCode;
+
+if (isset($state['SPMetadata'])) {
+	$t->data['SPMetadata'] = $state['SPMetadata'];
+} else {
+	$t->data['SPMetadata'] = NULL;
+}
+
 $t->show();
 exit();
 
diff --git a/modules/core/www/loginuserpassorg.php b/modules/core/www/loginuserpassorg.php
index bba9d798d3e232ff50ccdaf009282cf72607d7c6..ab5c4063325c15c9684a484b95ed9bf25bd65eb8 100644
--- a/modules/core/www/loginuserpassorg.php
+++ b/modules/core/www/loginuserpassorg.php
@@ -57,6 +57,12 @@ if ($organizations !== NULL) {
 	$t->data['organizations'] = $organizations;
 }
 
+if (isset($state['SPMetadata'])) {
+	$t->data['SPMetadata'] = $state['SPMetadata'];
+} else {
+	$t->data['SPMetadata'] = NULL;
+}
+
 $t->show();
 exit();