diff --git a/www/admin/metadata.php b/www/admin/metadata.php
index ebf0972f07da2e514c1a9daded80d41e2c5b4593..610d6f1e67193f8588e1f91beca8d87ebf89150a 100644
--- a/www/admin/metadata.php
+++ b/www/admin/metadata.php
@@ -79,7 +79,7 @@ try {
 		foreach ($metalist AS $entityid => $mentry) {
 			$results[$entityid] = SimpleSAML_Utilities::checkAssocArrayRules($mentry,
 				array('entityid', 'host'),
-				array('NameIDFormat', 'ForceAuthn')
+				array('NameIDFormat', 'ForceAuthn', 'metadata.sign.enable', 'metadata.sign.privatekey', 'metadata.sign.privatekey_pass', 'metadata.sign.certificate')
 			);
 		}
 		$et->data['metadata.shib13-sp-hosted'] = $results;
@@ -89,7 +89,7 @@ try {
 		foreach ($metalist AS $entityid => $mentry) {
 			$results[$entityid] = SimpleSAML_Utilities::checkAssocArrayRules($mentry,
 				array('entityid', 'SingleSignOnService', 'certFingerprint'),
-				array('name', 'description', 'base64attributes', 'metadata.sign.enable', 'metadata.sign.privatekey', 'metadata.sign.privatekey_pass', 'metadata.sign.certificate')
+				array('name', 'description', 'base64attributes')
 			);
 		}
 		$et->data['metadata.shib13-idp-remote'] = $results;