diff --git a/metadata-templates/saml20-idp-hosted.php b/metadata-templates/saml20-idp-hosted.php
index cbb8d96c90522d8d75b8694289d5026a36ffa839..3d46c4c2f46fc4e816832e37292f0dc11fcd00f6 100644
--- a/metadata-templates/saml20-idp-hosted.php
+++ b/metadata-templates/saml20-idp-hosted.php
@@ -19,11 +19,6 @@ $metadata = array(
 		'privatekey'		=>	'server.pem',
 		'certificate'		=>	'server.crt',
 		
-		/* If base64attributes is set to true, then all attributes will be base64 encoded. Make sure
-		 * that you set the SP to have the same value for this.
-		 */
-		'base64attributes'	=>	false,
-		
 		// Authentication plugin to use. login.php is the default one that uses LDAP.
 		'auth'				=>	'auth/login.php',
 		
diff --git a/metadata-templates/saml20-sp-remote.php b/metadata-templates/saml20-sp-remote.php
index d1b759362924b8549273cd29217f1f9e11bfae06..20d94352361f29c086725bf9b0b343f27fcb8df3 100644
--- a/metadata-templates/saml20-sp-remote.php
+++ b/metadata-templates/saml20-sp-remote.php
@@ -28,10 +28,16 @@ $metadata = array(
 		'ForceAuthn'					=>	'false',
 		'NameIDFormat'					=>	'urn:oasis:names:tc:SAML:2.0:nameid-format:transient',
 		
+		/* If base64attributes is set to true, then all attributes will be base64 encoded. Make sure
+		 * that you set the SP to have the same value for this.
+		 */
+		'base64attributes'	=>	false,
 		'simplesaml.attributes'			=>	true,
-//		'attributemap'					=>	'test',
-//		'attributes'					=>	array('mail')
-		 /*
+		//'attributemap'				=>	'test',
+		//'attributes'					=>	array('mail')
+		
+		
+		/*
 		 * When request.signing is true the certificate of the sp 
 		 * will be used to verify all messages received with the HTTPRedirect binding.
 		 * 
@@ -39,7 +45,7 @@ $metadata = array(
 		 * before verification can be done.  
 		 */
 		'request.signing' => false,
-		'certificate' => "saml2sp.example.org.crt",
+		'certificate' => "saml2sp.example.org.crt"
 	),
 	
 	/*