diff --git a/metadata-templates/wsfed-idp-remote.php b/metadata-templates/wsfed-idp-remote.php
index b7c11596acf0c1b1f24d6354411ee7c7d3e4a78e..5bfd3627ec1bb77d8be1d6817b553e36014d8c74 100644
--- a/metadata-templates/wsfed-idp-remote.php
+++ b/metadata-templates/wsfed-idp-remote.php
@@ -3,9 +3,8 @@
 $metadata = array( 
 
 	'urn:federation:pingfederate:localhost' => array(
-		'host' => 'localhost',
 		'prp' => 'https://localhost:9031/idp/prp.wsf',
-		'cert' => '/cert/pingfed-localhost.pem',
+		'certificate' => 'pingfed-localhost.pem',
 	),	
 );
 
diff --git a/metadata-templates/wsfed-sp-hosted.php b/metadata-templates/wsfed-sp-hosted.php
index d588ba776f9b3892805b8ee2610e3f3baa9effd6..04b082ee6017470d7049574c4f7b3ad01be17cc5 100644
--- a/metadata-templates/wsfed-sp-hosted.php
+++ b/metadata-templates/wsfed-sp-hosted.php
@@ -2,8 +2,7 @@
 
 $metadata = array( 
 	'urn:federation:simplesamlphp:localhost' => array(
-		'host'				=>	'localhost',
-		'realm' => 'urn:federation:simplesamlphp:localhost',
+		'host' => 'localhost',
 	),
 );
 
diff --git a/templates/default/admin-metadatalist.php b/templates/default/admin-metadatalist.php
index ae58901a61235dfb27b167c06d04ebd05b070b4d..7e4e8471f6a1a6a20e4d13ee8f5bbf9846524ce3 100644
--- a/templates/default/admin-metadatalist.php
+++ b/templates/default/admin-metadatalist.php
@@ -114,6 +114,11 @@
 		if (array_key_exists('metadata.shib13-idp-remote', $this->data)) 
 			showEntry('Shib 1.3 Identity Provider (Remote)', $this->data['metadata.shib13-idp-remote'], $this->data['baseurlpath']);
 
+		if (array_key_exists('metadata.wsfed-sp-hosted', $this->data))
+			showEntry('WS-Federation Service Provider (Hosted)', $this->data['metadata.wsfed-sp-hosted'], $this->data['baseurlpath']);
+		if (array_key_exists('metadata.wsfed-idp-remote', $this->data))
+			showEntry('WS-Federation Identity Provider (Remote)', $this->data['metadata.wsfed-idp-remote'], $this->data['baseurlpath']);
+
 		
 		?>
 
diff --git a/www/admin/metadata.php b/www/admin/metadata.php
index 248f0685b6a6d6cbd330ece99924f120d197db8d..d45d530969bafb64f26342975944317522f58c08 100644
--- a/www/admin/metadata.php
+++ b/www/admin/metadata.php
@@ -119,6 +119,29 @@ try {
 		
 	}
 
+	if ($config->getValue('enable.wsfed-sp') === true) {
+		$results = array();
+		$metalist = $metadata->getList('wsfed-sp-hosted');
+		foreach ($metalist AS $entityid => $mentry) {
+			$results[$entityid] = SimpleSAML_Utilities::checkAssocArrayRules($mentry,
+				array('entityid', 'host'),
+				array()
+			);
+		}
+		$et->data['metadata.wsfed-sp-hosted'] = $results;
+
+		$results = array();
+		$metalist = $metadata->getList('wsfed-idp-remote');
+		foreach ($metalist AS $entityid => $mentry) {
+			$results[$entityid] = SimpleSAML_Utilities::checkAssocArrayRules($mentry,
+				array('entityid', 'prp', 'certificate'),
+				array()
+			);
+		}
+		$et->data['metadata.wsfed-idp-remote'] = $results;
+
+	}
+
 	$et->data['header'] = 'Metadata overview';
 	$et->data['icon'] = 'bino.png';