diff --git a/www/index.php b/www/index.php
index 2479f41cd8038cdb18a6ef422d797228f152e271..a3d5b8f95748e449093ae4a81d3fa4c69f19481a 100644
--- a/www/index.php
+++ b/www/index.php
@@ -64,22 +64,22 @@ $linksmeta[] = array(
 
 if ($config->getValue('enable.saml20-sp') === true)
 	$linksmeta[] = array(
-		'href' => 'saml2/sp/metadata.php', 
+		'href' => 'saml2/sp/metadata.php?output=xhtml', 
 		'text' => 'link_meta_saml2sphosted');
 
 if ($config->getValue('enable.saml20-idp') === true)
 	$linksmeta[] = array(
-		'href' => 'saml2/idp/metadata.php', 
+		'href' => 'saml2/idp/metadata.php?output=xhtml', 
 		'text' => 'link_meta_saml2idphosted');
 
 if ($config->getValue('enable.shib13-sp') === true)
 	$linksmeta[] = array(
-		'href' => 'shib13/sp/metadata.php', 
+		'href' => 'shib13/sp/metadata.php?output=xhtml', 
 		'text' => 'link_meta_shib13sphosted');
 
 if ($config->getValue('enable.shib13-idp') === true)
 	$linksmeta[] = array(
-		'href' => 'shib13/idp/metadata.php', 
+		'href' => 'shib13/idp/metadata.php?output=xhtml', 
 		'text' => 'link_meta_shib13idphosted');
 
 
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index 9fcda4e2d0a11e2de8b865495e9a72f243e98cb9..f97010a00769be865274f3720c89f577b0c995ff 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -93,25 +93,29 @@ try {
 </EntityDescriptor>';
 	
 	
-	if (array_key_exists('output', $_GET) && $_GET['output'] == 'xml') {
+	if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
+		$defaultidp = $config->getValue('default-saml20-idp');
+		
+		$t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
+		
+	
+		$t->data['header'] = 'SAML 2.0 IdP Metadata';
+		$t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery());
+		$t->data['metadata'] = htmlentities($metaxml);
+		$t->data['metadataflat'] = htmlentities($metaflat);
+		$t->data['defaultidp'] = $defaultidp;
+		$t->show();
+			
+	} else {
+	
 		header('Content-Type: application/xml');
 		
 		echo $metaxml;
 		exit(0);
-	}
 
+	}
 
-	$defaultidp = $config->getValue('default-saml20-idp');
-	
-	$t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
-	
 
-	$t->data['header'] = 'SAML 2.0 IdP Metadata';
-	$t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
-	$t->data['metadata'] = htmlentities($metaxml);
-	$t->data['metadataflat'] = htmlentities($metaflat);
-	$t->data['defaultidp'] = $defaultidp;
-	$t->show();
 	
 } catch(Exception $exception) {
 	
diff --git a/www/saml2/sp/metadata.php b/www/saml2/sp/metadata.php
index 2efc97f73d52c2edeef2ccdf7baefc6d2c846ed3..6af101ad0c67f26f0c7852a2be733150c639794c 100644
--- a/www/saml2/sp/metadata.php
+++ b/www/saml2/sp/metadata.php
@@ -83,7 +83,28 @@ try {
 
 </EntityDescriptor>';
 
-	if (array_key_exists('output', $_GET) && $_GET['output'] == 'xml') {
+	if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
+		$defaultidp = $config->getValue('default-saml20-idp');
+		
+		$t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
+	
+		$t->data['header'] = 'SAML 2.0 SP Metadata';
+		$t->data['metadata'] = htmlentities($metaxml);
+		$t->data['metadataflat'] = htmlentities($metaflat);
+		$t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
+		
+		if (array_key_exists($defaultidp, $send_metadata_to_idp)) {
+			$t->data['sendmetadatato'] = $send_metadata_to_idp[$defaultidp]['address'];
+			$t->data['federationname'] = $send_metadata_to_idp[$defaultidp]['name'];
+		}
+	
+		$t->data['techemail'] = $config->getValue('technicalcontact_email', 'na');
+		$t->data['version'] = $config->getValue('version', 'na');
+		$t->data['defaultidp'] = $defaultidp;
+		
+		$t->show();
+		
+	} else {
 		header('Content-Type: application/xml');
 		
 		echo $metaxml;
@@ -91,25 +112,7 @@ try {
 	}
 	
 	
-	$defaultidp = $config->getValue('default-saml20-idp');
-	
-	$t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
 
-	$t->data['header'] = 'SAML 2.0 SP Metadata';
-	$t->data['metadata'] = htmlentities($metaxml);
-	$t->data['metadataflat'] = htmlentities($metaflat);
-	$t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
-	
-	if (array_key_exists($defaultidp, $send_metadata_to_idp)) {
-		$t->data['sendmetadatato'] = $send_metadata_to_idp[$defaultidp]['address'];
-		$t->data['federationname'] = $send_metadata_to_idp[$defaultidp]['name'];
-	}
-
-	$t->data['techemail'] = $config->getValue('technicalcontact_email', 'na');
-	$t->data['version'] = $config->getValue('version', 'na');
-	$t->data['defaultidp'] = $defaultidp;
-	
-	$t->show();
 	
 } catch(Exception $exception) {
 	
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index 9c7cf1c2ba1533fdc75f5a0c5c3cb5c86c582178..137b1afa1704865b4a85a8c6082d06068e6a452f 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -78,7 +78,23 @@ try {
 </EntityDescriptor>';
 	
 	
-	if (array_key_exists('output', $_GET) && $_GET['output'] == 'xml') {
+	if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
+		$defaultidp = $config->getValue('default-shib13-idp');
+		
+		$t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
+	
+		$t->data['header'] = 'Shib 1.3 IdP Metadata';
+		
+		$t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
+		$t->data['metadata'] = htmlspecialchars($metaxml);
+		$t->data['metadataflat'] = htmlspecialchars($metaflat);
+	
+		$t->data['defaultidp'] = $defaultidp;
+		
+		$t->show();
+		
+	} else {
+	
 		header('Content-Type: application/xml');
 		
 		echo $metaxml;
@@ -86,19 +102,6 @@ try {
 	}
 
 
-	$defaultidp = $config->getValue('default-shib13-idp');
-	
-	$t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
-
-	$t->data['header'] = 'Shib 1.3 IdP Metadata';
-	
-	$t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
-	$t->data['metadata'] = htmlspecialchars($metaxml);
-	$t->data['metadataflat'] = htmlspecialchars($metaflat);
-
-	$t->data['defaultidp'] = $defaultidp;
-	
-	$t->show();
 	
 } catch(Exception $exception) {
 	
diff --git a/www/shib13/sp/metadata.php b/www/shib13/sp/metadata.php
index 463a4d382ce5e2ba8562f0874174587bd24fac04..dda97b716606089a41ae30841655c28cda42c488 100644
--- a/www/shib13/sp/metadata.php
+++ b/www/shib13/sp/metadata.php
@@ -55,35 +55,39 @@ try {
 		
 </EntityDescriptor>';
 
-	if (array_key_exists('output', $_GET) && $_GET['output'] == 'xml') {
+	if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
+		$defaultidp = $config->getValue('default-shib13-idp');
+		
+		$t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
+		
+	
+		$t->data['header'] = 'Shib 1.3 SP Metadata';
+		$t->data['metadata'] = htmlspecialchars($metaxml);
+		$t->data['metadataflat'] = htmlspecialchars($metaflat);
+		$t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
+		
+		/*
+		if (array_key_exists($defaultidp, $send_metadata_to_idp)) {
+			$et->data['sendmetadatato'] = $send_metadata_to_idp[$defaultidp]['address'];
+			$et->data['federationname'] = $send_metadata_to_idp[$defaultidp]['name'];
+		}
+		*/
+	
+		$t->data['techemail'] = $config->getValue('technicalcontact_email', 'na');
+		$t->data['version'] = $config->getValue('version', 'na');
+		$t->data['defaultidp'] = $defaultidp;
+		
+		$t->show();
+		
+	} else {	
+	
 		header('Content-Type: application/xml');
 		
 		echo $metaxml;
 		exit(0);
 	}
 	
-	$defaultidp = $config->getValue('default-shib13-idp');
-	
-	$t = new SimpleSAML_XHTML_Template($config, 'metadata.php');
-	
 
-	$t->data['header'] = 'Shib 1.3 SP Metadata';
-	$t->data['metadata'] = htmlspecialchars($metaxml);
-	$t->data['metadataflat'] = htmlspecialchars($metaflat);
-	$t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
-	
-	/*
-	if (array_key_exists($defaultidp, $send_metadata_to_idp)) {
-		$et->data['sendmetadatato'] = $send_metadata_to_idp[$defaultidp]['address'];
-		$et->data['federationname'] = $send_metadata_to_idp[$defaultidp]['name'];
-	}
-	*/
-
-	$t->data['techemail'] = $config->getValue('technicalcontact_email', 'na');
-	$t->data['version'] = $config->getValue('version', 'na');
-	$t->data['defaultidp'] = $defaultidp;
-	
-	$t->show();
 	
 } catch(Exception $exception) {