diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index 2d3360b758662b21a952dda8d84d52a7dd2cb0b1..359a6d8b0b04b129593f58d2f8e7bb57b7001a4b 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -95,10 +95,13 @@ try {
 	$metaBuilder = new SimpleSAML_Metadata_SAMLBuilder($idpentityid);
 	$metaBuilder->addMetadataIdP20($metaArray);
 	$metaBuilder->addOrganizationInfo($metaArray);
-	$metaBuilder->addContact('technical', array(
-		'emailAddress' => $config->getString('technicalcontact_email', NULL),
-		'name' => $config->getString('technicalcontact_name', NULL),
-	));
+	$technicalContactEmail = $config->getString('technicalcontact_email', NULL);
+	if ($technicalContactEmail && $technicalContactEmail !== 'na@example.org') {
+		$metaBuilder->addContact('technical', array(
+			'emailAddress' => $technicalContactEmail,
+			'name' => $config->getString('technicalcontact_name', NULL),
+		));
+	}
 	$metaxml = $metaBuilder->getEntityDescriptorText();
 
 	/* Sign the metadata if enabled. */