1 files changed, 76 insertions, 55 deletions
diff --git a/swamid-2.0/metadata.swamid.se-shibboleth.xml b/swamid-2.0/metadata.swamid.se-shibboleth.xml
index 52654603..d0fe7fd2 100644
--- a/swamid-2.0/metadata.swamid.se-shibboleth.xml
+++ b/swamid-2.0/metadata.swamid.se-shibboleth.xml
@@ -23,6 +23,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -30,12 +31,8 @@
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://metadata.swamid.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://metadata.swamid.se/Shibboleth.sso/Login" index="1"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://metadata.swamid.se/Shibboleth.sso/DS/nordu.net"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://metadata.swamid.se/Shibboleth.sso/DS/nordu.net" index="2"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://metadata.swamid.se/Shibboleth.sso/DS/swamid-test"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://metadata.swamid.se/Shibboleth.sso/DS/swamid-test" index="3"/>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://metadata.swamid.se/Shibboleth.sso/DS/seamless-access"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://metadata.swamid.se/Shibboleth.sso/DS/seamless-access" index="4"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://metadata.swamid.se/Shibboleth.sso/DS/seamless-access" index="2"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">SWAMID Metadatahanterare</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">SWAMID Metadatahandler</mdui:DisplayName>
@@ -45,67 +42,78 @@
         <mdui:InformationURL xml:lang="en">https://metadata.swamid.se/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="115" xml:lang="en">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://metadata.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://metadata.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>metadata.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
-MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
-/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
-Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
-2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
-qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
-95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
-fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
-+z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
-X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
-AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
-fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
-l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
-6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
-l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
-lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
-Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
-LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
-KK/Bciw51EZ7Ew==
+          <ds:X509SubjectName>CN=metadata.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFCDCCAvCgAwIBAgIUXhZTS1ioHrb7SRXJ+A5gFxEgxXswDQYJKoZIhvcNAQEL
+BQAwHTEbMBkGA1UEAxMSbWV0YWRhdGEuc3dhbWlkLnNlMB4XDTIxMTIwODEyMDg1
+MVoXDTMxMTIwNjEyMDg1MVowHTEbMBkGA1UEAxMSbWV0YWRhdGEuc3dhbWlkLnNl
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsEeOv3NGbAILATUpRvO8
+D79Hff+1Ve2I7SEjOEUCtXdAltygEKC2fb/CQFbxYCDaUM3k2j9XI6YcTOfUogIQ
+iU+3KVI5LC67IHb0qHdwmd5dJ/u7p1nztVfUY5hJUOk0DMIRhdwfIQ/Y6E8XFe0u
+oHJRUic5taPUupYQMOrkARSOkqdL4yfgKYGV8TvjucaRKy8G6YQVrj7k2vK6QK0U
+U8sBt/gaxtdjF9RKoKWDKAiCtwUtY4ejP8dKJGhlTQjS4OsNzSt24k1rtxxRai/J
+J6RxMiF4rUGE2/X36/UZB0/WKYu/83wtCtpd2zt07cBTqeQn5LRldQ8rLIeFBNJG
+M+tuEuA0d1HaY30fObW1ADNApmu7XU9aHQ3zb6UwM0BL0Hw5jJ3ZHQKn3JhEtlZc
+wHTCbAo/uL28HsNCFJ6gmfsqekcT5Hz7xIwqm54abyfE2nzYuTiE7cPaM8bxdsiy
+z4ZHaEfIHrmk9D/I8z67er0MgufF4bPtiLsmM6lMTnWPzf0LSGwOgLpfHmS8qWpq
+n4VfKZuT12SToN/GjWdaW4fKjBqnLzC7SBESyGYe3hXehzci/zjsTXEceRr9T6rl
+LDoryY6qfuj6x4qSAZGVogBn8vdsaVIkEjCeL3CjZEBvNGI22MuZxrYy2exacEtc
+SfWycimjiJJdxEjR86uHFcMCAwEAAaNAMD4wHQYDVR0RBBYwFIISbWV0YWRhdGEu
+c3dhbWlkLnNlMB0GA1UdDgQWBBR+B1AA5P4VrbhI45bkKT6pnwxxADANBgkqhkiG
+9w0BAQsFAAOCAgEApqGyl5DB6RonpheR29WuRy5zBmwoy7NCOsDJZtcIQxkT5dVq
+CNKQ2uIhvgmzKRwYUKzTwD2aSUe6x0EsvsrVe2C5trNGiiYJTUxop8GkDYWHtFxP
+y7w9SFak5ptnPw9bMG3Edqdl7GiXLfGFJPsk9at87+/vznxlo9PRBQkhw4AqiH63
+C2yRUv44SaWvS1ktLlXfH+C7N8iJ1XgG4gLY5q+ma+G5DTwmKbHNSGBFJeRiLdDF
+M4kvOLOZxOm++c18/eSLCKaIcTbOBeLqtCMFHaz/2MI+8Ov7Z9ygza4xBXznS6aS
+9IL4WRO6yOn8FCnHDGA18nHRGbrag0Rqnb796sxiKKyzuzhI+Tz8WUwLGha7RHDX
+W1O4wlf4o8KmV1P3v1bDenE8Gs/meBgC0HFu2lBVLF5q4lkpg1fDxDZ2JxHGqzGI
+qhhnC+PHTs2e9O5NnnNWwpuDG+0cKl1BhBxmDvG9NpagIhYmjcyjFroLtk7OBTNo
+Cg6vNth8Eol89l2NdIgM2Mc4R3M4hUB6a7PevHzkKE7Kuzb5YaMkNAxku2vcC6ZF
+rJF2kQt+/S6/42m6YjHJUHWSnqbp1cFZhypxarhCa5inyDzdS8j1wF0SB9ROqhKq
+nyDcrXNgAZWJpziQ1z/LnBGIBA9nmiqPYitbfdWnRFITh1hes83NCrBExA4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>metadata.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
-MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
-iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
-TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
-yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
-aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
-nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
-wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
-GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
-fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
-AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
-/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
-8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
-PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
-RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
-CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
-b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
-2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
-rtSd5rXgy930PQ==
+          <ds:X509SubjectName>CN=metadata.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFCDCCAvCgAwIBAgIUUqfFg9jqcAJ1NxLzR15E15dVG/IwDQYJKoZIhvcNAQEL
+BQAwHTEbMBkGA1UEAxMSbWV0YWRhdGEuc3dhbWlkLnNlMB4XDTIxMTIwODEyMDkw
+M1oXDTMxMTIwNjEyMDkwM1owHTEbMBkGA1UEAxMSbWV0YWRhdGEuc3dhbWlkLnNl
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAu65fYf5f6gipna9HwPo8
+zlc9sY6QVh5FiDp3UrSeaG3pODejv9Y+ftCsJjVIQynGo7kUJtLFf+BIlhkZx8F9
+FUXHx9J0IGXa/2AGJ+i2avI8L5eoben96essn48UAd3VDbzhQVRv3lmbvQMmWscr
+N1GBZ2K9Rfppb0XLQ5FRDKBVuSnwtuTObiAyXsM9VhKET2HjMMX0kkX12/ZGp4U3
+MOMUlVx7V+9cDEIOSAdx97K+FCAHzfuLOiSxtlCy0KFN6s/v4CYFi/SVzG8Kvh5F
+1B9Y7l4RtvAlj7+PBpVoVXmgM+oy6rC53J4+5rWrS7bJUVwRj5sDIDgU8CkBgD5W
+SRlLlhrIg+KHcOVwvmq10ZdEX0RSjeW1toF0AcGS4W/iy62J3pgQjtm+33PTLWGG
+A0a40xHIRX2uuK9hHj+aKN6DHEjwjj+wQc0ai22hRHM7gvckpaXaMqHy7VQ3Y3gL
+BdRzchtjsvYaTAGdMVCR4etxdz8Bwt0FonhubrxizR6pBTZl3avYWaHMEbOj6G/X
+pFOzUfO2TWUw5evP8vjF4AbDDUaOgY9OIrBC+FKUEBs5p+o2CpL8p62L0MDyOeuJ
+uJGdovNmh5dH8o8Gz9ua2gAymbl4ajWlRbYAQZWEobJY5lXUsIjAt7SLuC//D1Up
+EwrI4W8vpsaFaLrF20HLqr0CAwEAAaNAMD4wHQYDVR0RBBYwFIISbWV0YWRhdGEu
+c3dhbWlkLnNlMB0GA1UdDgQWBBTQxMP8xC4uu5ow2xB+KmNRqIkbEDANBgkqhkiG
+9w0BAQsFAAOCAgEAlW3nl/1Rlb0+j2rPtXHxzl+6kg6iqFSae4mozXAkQ8JM+r/L
+RvtfFeitD1cPgya3uVe3AkI6rwwllZ9bCjO+SaUWLYsbvpjp00Q+Fi29DtckCgs4
+GBK/sAtI9XLcS2m1vScgRKth7JwaDpyA3BOnO6Icc1HE12HLmk660Q4YTsXCCaNl
+f6xVgkezxxpiOkxJlEjFTxbsj/bP0jMRUr+VGzd2jxY+llV21hyxlVPCqBlYvmEZ
+bEGPNiEc6Pplf4nTPY1mAFLLTqHeLkw01pUJig8BOpFhyD1eHIbPAwSUsasy41nb
+UBaE8f+OSdhQXdlS4A3HUGfxpBvNW3cH5tvNkpG5YnvGQhSINs6KTBKjS8+aC4I1
+zV9Wge2o5KZXnSKO0YkupmCqesMPUiEFduCTA3CcZ3ETRx7HzwC5YQd8x3fH+Jk6
+he2HeMB+NfUVXH+b0qLt++CrPiJl8m8uqa7Y4V/RVVPYOfP4FHj5Hn3m3XXy/PEV
+ke4AbXv0DbKaSF8KViAyb5Al4Ozf/ucb5FRoPzSuGZd4Pa3XxIDakucB7w1d1zlH
+4G4d5dQCPiOYtiUz+OsdyLAfWmLvYgG2XKcuhHlCZhrNKHTAV4ggtKaHHb/AmKbI
+pB/vkMnJTcA2+qTB7X2SVXqYpm/llShFwhEDO5jIyioNh20hI7+RftE+qOM=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -125,10 +133,12 @@ rtSd5rXgy930PQ==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metadata.swamid.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://metadata.swamid.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metadata.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://metadata.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://metadata.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://metadata.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Metadata for SWAMID</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Metadata for SWAMID</md:ServiceName>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -136,11 +146,22 @@ rtSd5rXgy930PQ==
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:Company>SWAMID</md:Company>
+    <md:GivenName>SWAMID Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SWAMID Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SWAMID Operations</md:GivenName>
     <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>