diff --git a/modules/metaedit/lib/MetaEditor.php b/modules/metaedit/lib/MetaEditor.php
index f3817390d4dcab0b0cab9c635854750fc234abe6..0d8335853bd548053c666d5cfb0e2058083eb222 100644
--- a/modules/metaedit/lib/MetaEditor.php
+++ b/modules/metaedit/lib/MetaEditor.php
@@ -18,10 +18,16 @@ class sspmod_metaedit_MetaEditor {
 		}
 	}
 	
-	protected function getEndpointField($request, &$metadata, $key, $binding) {
+	protected function getEndpointField($request, &$metadata, $key, $binding, $indexed) {
 		if (array_key_exists('field_' . $key, $request)) {
-			$e = array(array('Binding' => $binding, 'Location' => $request['field_' . $key], 'index' => '0'));
-			$metadata[$key] = $e;
+			$e = array(
+				'Binding' => $binding,
+				'Location' => $request['field_' . $key]
+			);
+			if ($indexed) {
+				$e['index'] = 0;
+			}
+			$metadata[$key] = array($e);
 		} else {
 			if (isset($metadata[$key])) unset($metadata[$key]);
 		}
@@ -31,8 +37,8 @@ class sspmod_metaedit_MetaEditor {
 		$this->getStandardField($request, $metadata, 'entityid');
 		$this->getStandardField($request, $metadata, 'name');
 		$this->getStandardField($request, $metadata, 'description');
-		$this->getEndpointField($request, $metadata, 'AssertionConsumerService', SAML2_Const::BINDING_HTTP_POST);
-		$this->getEndpointField($request, $metadata, 'SingleLogoutService', SAML2_Const::BINDING_HTTP_REDIRECT);
+		$this->getEndpointField($request, $metadata, 'AssertionConsumerService', SAML2_Const::BINDING_HTTP_POST, TRUE);
+		$this->getEndpointField($request, $metadata, 'SingleLogoutService', SAML2_Const::BINDING_HTTP_REDIRECT, FALSE);
 		// $this->getStandardField($request, $metadata, 'certFingerprint');
 		$metadata['updated'] = time();