SWAMID-3270: Updated 10 SPs for Ladokmd-2023-11-01-v01

10 files changed, 87 insertions, 83 deletions

diff --git a/metadata/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
index 9b98611f..e138c1c0 100644
--- a/metadata/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
+++ b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
@@ -27,7 +27,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
@@ -87,8 +87,6 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for employees</md:ServiceName>
diff --git a/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
index 321e72fa..2f778c77 100644
--- a/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
+++ b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
@@ -30,7 +30,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/Login" index="1"/>
@@ -90,8 +90,6 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
diff --git a/metadata/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml b/metadata/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
index 84ae05f6..de674eb2 100644
--- a/metadata/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
@@ -30,7 +30,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/Login" index="1"/>
@@ -90,8 +90,6 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
diff --git a/metadata/swamid-2.0/student.test.ladok.se-student-sp.xml b/metadata/swamid-2.0/student.test.ladok.se-student-sp.xml
index 4a4c19d5..b4f7ca91 100644
--- a/metadata/swamid-2.0/student.test.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/student.test.ladok.se-student-sp.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.test.ladok.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-23T10:34:25Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -23,10 +20,17 @@
     <mdattr:EntityAttributes>
       <samla:Attribute 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>http://id.elegnamnden.se/ec/1.0/eidas-naturalperson</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/loa3-pnr</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/st/1.0/public-sector-sp</samla:AttributeValue>
+        <samla:AttributeValue>http://id.swedenconnect.se/contract/sc/eid-choice-2017</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-23T10:34:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.test.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.test.ladok.se/Shibboleth.sso/Login" index="1"/>
@@ -35,15 +39,25 @@
         <mdui:DisplayName xml:lang="en">Ladok for students student.test.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
         <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.test.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://student.test.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.student.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.student.ladok.se/logo/ladok_en.png</mdui:Logo>
         <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>https://student.test.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.test.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.test.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAMfe9MUSIYwzMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMTFXN0dWRlbnQudGVzdC5sYWRvay5zZTAeFw0xNjAzMTcxMDQ0MTRaFw0yNjAzMTUxMDQ0MTRaMCAxHjAcBgNVBAMTFXN0dWRlbnQudGVzdC5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoXQxzxa7rCjHFU3SiCf9W//E5xgZugxikwRTBus+1XiT9oNDSiztbFPTGsUv/PLaSeyPs6hqd2bpBh3yOOItb/PCQJhGLVWFXZHSBifX4Aa+bh18ZbXtIPT8P+LhNMesdh6DVnDo5Ksd2cvbHxRO9WlNMbtzNM5iUJZiVfwmkwo3Y5xbWQ3NPCinmMQPWLVl0gKteoouu5SrCUm6s/TFNNIspQIJRUlieSn0MUyYCidLpadbNEarcC5wX4Pn9viA4ZBimiUcOzbPyxUcdLdW3bHUEOE/F0b/+34N4oBUytLcFo4nTlUjWaKBSv7dwFAYt0UjATVp+LdMwZmBcgrvsCAwEAAaNpMGcwRgYDVR0RBD8wPYIVc3R1ZGVudC50ZXN0LmxhZG9rLnNlhiRodHRwczovL3N0dWRlbnQudGVzdC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFEdfw76scgUAy16cvwoO7eZP/DQbMA0GCSqGSIb3DQEBCwUAA4IBAQAdEWyyTL9P5TTNX0NuJmGAHNR/yi/RUIZ8vbFzuuSsFmMnKN+iVyQqnS0cWsHXs/KWNdziHSHcQusKp0l8Zmmb6Dj2adzigSVW22GNdFsDSRUkKuI70SP0gWCjlQ6pezYCNzNlG85VnMRHWkP461l2YUmMJSKSreltDQGom/gj9JDiFxaGr7puePNSyYqVX4AFY81u+JB5+tTTgyNhZRxcfUO4UUy2FV9/ugZdSEQmuL2TcPi/Qjr7iYf421GeoBUvEWeANRekKCb5IRhvWmw/KKCbhHGTmGZP2tQ6zng2z2GDI1/icN6GfRAuzgthsOqC74sM4tn8VoLT0IdDOPj5</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:KeyName>https://student.test.ladok.se/student-sp</ds:KeyName>
         <ds:KeyName>student.test.ladok.se</ds:KeyName>
@@ -71,11 +85,11 @@
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.test.ladok.se/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.test.ladok.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.test.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.test.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.test.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.test.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.test.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.test.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
@@ -83,11 +97,12 @@
       <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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/student.utbildning.ladok.se-student-sp.xml b/metadata/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
index 1dc2d356..65bd5dcf 100644
--- a/metadata/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.utbildning.ladok.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-03-20T16:31:43Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -23,10 +20,17 @@
     <mdattr:EntityAttributes>
       <samla:Attribute 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>http://id.elegnamnden.se/ec/1.0/eidas-naturalperson</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/loa3-pnr</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/st/1.0/public-sector-sp</samla:AttributeValue>
+        <samla:AttributeValue>http://id.swedenconnect.se/contract/sc/eid-choice-2017</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-03-20T16:31:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.utbildning.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.utbildning.ladok.se/Shibboleth.sso/Login" index="1"/>
@@ -35,15 +39,25 @@
         <mdui:DisplayName xml:lang="en">Ladok for students student.utbildning.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
         <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.utbildning.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://student.utbildning.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.student.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.student.ladok.se/logo/ladok_en.png</mdui:Logo>
         <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>https://student.utbildning.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>student.utbildning.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=student.utbildning.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJALnpkw7cfggwMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNVBAMTG3N0dWRlbnQudXRiaWxkbmluZy5sYWRvay5zZTAeFw0xOTAxMzExMzA2MTNaFw0yOTAxMjgxMzA2MTNaMCYxJDAiBgNVBAMTG3N0dWRlbnQudXRiaWxkbmluZy5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZ2qgLHZxYraUrDO+0eh4L8h8yAqjarlJeiaa2G6kvaCPjrMhCN1Wf4eViCF6/YghRUd7RKSZ932vsU++auFW1tNOe7nWel0S+PuX/u9QR1iX46t/V89LT62Q4svOxcO13phcKJ/0vgII3ojZag8yg26pZxMk3qsmFFNrh9or9ezZHEmUQUvIv/h5bqXEuZBYWfSfOcPJUFbwzXl7lul9WiHvW/GYdokFlgNTxhtFZjWa7P/bcojv2gBIszQ4EyPXdYkHU1sDfKA7w59dCBY2RnWsyx/CEQcedmlCZoXiandu/DH57bRZmy7MhXg+fqOXufo5Vu+uL+RN8xqpD4gJkCAwEAAaN5MHcwVgYDVR0RBE8wTYIbc3R1ZGVudC51dGJpbGRuaW5nLmxhZG9rLnNlhi5odHRwczovL3N0dWRlbnQudXRiaWxkbmluZy5sYWRvay5zZS9zdHVkZW50LXNwMB0GA1UdDgQWBBS2/G4RBH+vTMQT6ptLqg/vB6YKXjANBgkqhkiG9w0BAQsFAAOCAQEARhAWHyQee0ndMnQWqHSzsFl1Mn2gSYCgpsdzJSgrm8Lsuyq+sf6pfqQa/auodeqFrBwb3UNpyFBuS/du6XtqsQMbick3aIFJ5aHRr1Z32dGKNtyWEzn8ueDPkxkrmTMkX4Q+ehIkb9RHMGM1LABx3LR4OeJ5FxZnpwHPoi9VZn79OMuflrb0HK3oComFcluTV4lDDQRDF0HoHsT1E9iPnMA3/lIzKxHggMYWDoue9eOj3yrW2gGzkhRCADBLAvLcEU4Km8a4VzDbEiY2oWvzTYCxb8BoMmJtECDRy/QPocGlN9Nc4QUn2n+nWOepHcuqbgJkRgcnFJrdcZoIu5GHMw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:KeyName>https://student.utbildning.ladok.se/student-sp</ds:KeyName>
         <ds:KeyName>student.utbildning.ladok.se</ds:KeyName>
@@ -71,11 +85,11 @@
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.utbildning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utbildning.ladok.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utbildning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utbildning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utbildning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.utbildning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.utbildning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.utbildning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
@@ -83,11 +97,12 @@
       <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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
diff --git a/metadata/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml b/metadata/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
index 83e37907..7afd220a 100644
--- a/metadata/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
+++ b/metadata/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
@@ -27,7 +27,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/Login" index="1"/>
@@ -87,8 +87,6 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for employees</md:ServiceName>
diff --git a/metadata/swamid-2.0/www.student.ladok.se-student-sp.xml b/metadata/swamid-2.0/www.student.ladok.se-student-sp.xml
index d38c0766..ecc1c98d 100644
--- a/metadata/swamid-2.0/www.student.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/www.student.ladok.se-student-sp.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.student.ladok.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-26T09:06:33Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -23,14 +20,23 @@
     <mdattr:EntityAttributes>
       <samla:Attribute 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>http://id.elegnamnden.se/ec/1.0/eidas-naturalperson</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/loa3-pnr</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/st/1.0/public-sector-sp</samla:AttributeValue>
+        <samla:AttributeValue>http://id.swedenconnect.se/contract/sc/eid-choice-2017</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-26T09:06:33Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.student.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.student.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Ladok för studenter www.student.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok for students www.student.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
         <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
         <mdui:Logo xml:lang="sv" width="96" height="98">https://www.student.ladok.se/logo/ladok_sv.png</mdui:Logo>
@@ -39,11 +45,19 @@
         <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
-        <mdui:DisplayName xml:lang="en">Ladok for students</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Ladok för studenter</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>https://www.student.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>www.student.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.student.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJAOCnVBGvbu36MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNVBAMTFHd3dy5zdHVkZW50LmxhZG9rLnNlMB4XDTE2MDQyNTExMjczMloXDTI2MDQyMzExMjczMlowHzEdMBsGA1UEAxMUd3d3LnN0dWRlbnQubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHGKGOBwvvrybht4ptf12h7SjSW4WQV7FdfyLJxAtoVH++3XgnsS88BhYNaOWYysUL2q+YH5qdq8ZfOrw0//VaHz2LEqqWLloG1sADvw1GyN+YZLmTOayhxpMp2MHxxM9tynhoyYeFF3GEvME9zJxkcmBN0oe0P+QLicuYnJNU8wDzpiV+k70DZttRTDp7z+ewVMaOPcrhkItiEzdDD0NE5YGo1kIgn8ZC7SdhWcIvgM/POeWM74VPmsTlN3Muf7+7T80EzhfbexANf4srflZLN7VS+Os4JWsbTh8qycOFu0M4llmOBgdC2BYKDoNXZGDCYE5ImWkjcn2pBMlsvp5HAgMBAAGjZzBlMEQGA1UdEQQ9MDuCFHd3dy5zdHVkZW50LmxhZG9rLnNlhiNodHRwczovL3d3dy5zdHVkZW50LmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUxMCnw4eJUufZfek3vLBmzfWrcw0wDQYJKoZIhvcNAQELBQADggEBADl0sb5+Ct83vuwR8m6DtxAy+QfGVJQsSHVzQw6n9XeWx5pREWNEDMUcZZ4/On+bi7KdY2WpDqgNJSTlSKKZ5b4vbQ4P0v0hyeHIvHYW+3QnQPta+oMf0lCi2+GTupVihw9NvwZgK0PjhXyG3ci5aWBWjd3aQvnJKt3hDgOf4Fvtih8OXhl89hyb6VsXA5v2wZk9M4QOoIraNOxnNH0ntqa/dSjUixZQm1zM5PRAweCt9rLUgTrAwbfSykzaeHiRm5j4zJn/3frVs/b2ZyBNvVkujS1Hxz4HZx54okaK76e3jPW6Hw8lPm8WEg05QDIkgjEKpQCY9hDXukP8NnV685Q=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:KeyName>https://www.student.ladok.se/student-sp</ds:KeyName>
         <ds:KeyName>www.student.ladok.se</ds:KeyName>
@@ -71,11 +85,11 @@
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.student.ladok.se/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.student.ladok.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.student.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.student.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.student.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.student.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
@@ -83,11 +97,12 @@
       <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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
diff --git a/metadata/swamid-edugain/www.start.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.start.ladok.se-gui-sp.xml
index eed4d1b8..2eb2f9e1 100644
--- a/metadata/swamid-edugain/www.start.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.start.ladok.se-gui-sp.xml
@@ -27,13 +27,13 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.start.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.start.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok för personal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok for employees</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Ladok för personal www.start.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok for employees www.start.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
         <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
         <mdui:Logo xml:lang="sv" width="96" height="98">https://www.start.ladok.se/logo/ladok_sv.png</mdui:Logo>
@@ -53,15 +53,6 @@
           <ds:X509Certificate>MIIDIDCCAgigAwIBAgIJAJ9ZObDxOs3/MA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEnd3dy5zdGFydC5sYWRvay5zZTAeFw0xNjA0MjUxMDA1NTRaFw0yNjA0MjMxMDA1NTRaMB0xGzAZBgNVBAMTEnd3dy5zdGFydC5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJoQ9FWIadS9qwygHOArRhD2zsKwK8AvOn00tZDk2atdpYO+ZZNnd2GjmdZg1ZLchfr3odvGDHzAtmuob3eTdWr+FSVkN2gs4zsqcYXOcyuHeO++xxuW7p0RVDG4Yoh/losV/Gc/DWHVtzlih85UWx1JUwk3r+5sprB2GxJEyR+0K8OA0pKnO4HY+I229g4b+gDVeiZT2mgpRdv5ZiKkSCCXDfktTxCzBr5rEORpjcQeGphJmkS2NrwAhz7LD8jmZCSn8C1HndhB6+syAh9uckcVgwo9TXqznTu9xx1He23MjYsZo79u7DuoMiDXY+8A7v4/CQ9DdFqcqfDfW7VcEi0CAwEAAaNjMGEwQAYDVR0RBDkwN4ISd3d3LnN0YXJ0LmxhZG9rLnNlhiFodHRwczovL3d3dy5zdGFydC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFBTI2HIkkPdufvJjk7xyMM1ElUR3MA0GCSqGSIb3DQEBCwUAA4IBAQBiG3egtaHpHUefSZwdZtKe6TMV0WCDjHLVaBtGN8VYTJgkVwb3dU4nU5J1BnK4nRAEvxoOPRjy6QVvWuVhfWWa2wUJO2W+qbefu4UNFoB/q4SUYuzlMzZBcSheN/Xp1GtyfLY/0htNuL+V5dqCXqpDUDL+w/p920OUohQvStSkBn05CcRrrj+u9OvSDjEka1eMhx3QjRHyMQ4pytf/d5Z16aLE1Y5ow0IXKQ4/j63DbELE2yMbs7iEBCtgHuu/KlG8qhCWwhlP7QNHFhv3D0wKwREAtnOrDsuNVwKdafKPx82ANlnCVaJVclgEH/S2/fMYv1ZvrsvqK0siDLr5EEpH</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
@@ -96,8 +87,6 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.start.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.start.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.start.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.start.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.start.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for employees</md:ServiceName>
diff --git a/metadata/swamid-edugain/www.test.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.test.ladok.se-gui-sp.xml
index cfe4ca3f..4355431e 100644
--- a/metadata/swamid-edugain/www.test.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.test.ladok.se-gui-sp.xml
@@ -27,7 +27,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.test.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.test.ladok.se/Shibboleth.sso/Login" index="1"/>
@@ -53,15 +53,6 @@
           <ds:X509Certificate>MIIFHDCCAwSgAwIBAgIJAIbDYkZWg5D9MA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMTEXd3dy50ZXN0LmxhZG9rLnNlMB4XDTE2MDIxMDEzMzUzNloXDTI2MDIwNzEzMzUzNlowHDEaMBgGA1UEAxMRd3d3LnRlc3QubGFkb2suc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC+W5Gi4u6RApYh068l1O/jZB1LKHMYfBa7BeR1nGjZXTI15BhJJDeaIqiIyZCwmPiki66Ma5frzSERCki1u7rfP38/bddLtvCCpYhPxmQhOFWXQ3SXaWQETSZ3mVLnZmUk7rrnANnfKFLst0AGAAZGJ1M2CTT9yLXhzm4v/klsaoVjpOmfpmNlMV+wWj35fpm2Ni8XL1aSQnz0Q6/vUtbP+zbRUwMpXFC/8NO/+JT5HMOq6fAJpVJvozwOcPQ83ZaZRYYk2dcOPWgEG5Y4ooEnGdLNfiKQ6DyaMEevKGfaLdapWntSi4aeQoqDnGU13nbaRAMvOs389phEHQDpq28qGL3Njwgdg+yLGzJj9jUlkYkz7CvR+GQLsZqOeudX/3P1EhavPpk1aG7bGhUUhuLI67m0I5u6axXZi7UQHKqOL4zjNvz1YpL4fel/47WcteYHarumJmuBpmvCqJAfjn9hZMqOkCLbY3NW/qaiTRznyxNiK+bYZ0VfUcDCvsac0+NcU9a42j5fo1a2Y9q/7MMq76TJ3176t+rYWqJi199jmKfyffcrriV4HXkYwYywDyWAn+imSuso+PW7SNDxFu7gY7pPgU2Dnov31lq8zJVpN3ssOEWaAJcbPcS4Ho/9o2kL6Hpp42yhNn0ZCnTeOQKpariM8BRN/12v9zXDaoPC6QIDAQABo2EwXzA+BgNVHREENzA1ghF3d3cudGVzdC5sYWRvay5zZYYgaHR0cHM6Ly93d3cudGVzdC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFHtJ6TbmFAeA4BaaLUhwxUHgEszoMA0GCSqGSIb3DQEBCwUAA4ICAQCnQhO2mDJe2HGQzC0Hts9rCxgSUQSR23e8FbXWFBniYByYPc786HJsoeDI3YvEO00rOSIRX45Mya5Iapbnj4F3f/ya6agLSjMk6ce9u+kqIeXii3JvFcV/biDdHSEdVgOEr39YMWP5tyaJhmesZLfy1SnJzlW3PrvFdgaKIfVJ2lfukx3OESJ10/CgRllf91eKpfTPB2g8vU0RAUq+odkkX7tSbGDpRtOYfym6FXZpdh2ZBft1QJV7E7jMJZ1dWx7gvp7w06JJozaXaiyIPKClEIYvEppBO+Hs7IbDS4kUSKdzF14wof7qpzQQ+yULmOkrfC80MHGXkKaYNB+mzQ2CAm+tmUDwu+6JNeNDlrN72AlojvsDObgsCHoQIVsSx2wFYDM2zTvA/MR71KHASEi8eGdXcOgn3UMS/ehYrnDq0m/bAjsn/AHjGjIqsFQUpzwqG3N2djGtOD2dzcxOOKCL31aHDlUTgv1hdCpa5+NiIzRrahJoJrfmli/NBlX5wQbQ0s1UVlbgy5Xw0Ttr4IIyLDCJR8LVHDuZcx5GKkrwQE6fWwLJM8JI8JZF0w9j8bsrU3WUfCwfMaCKvwFlYgQQY6TwKaxgtHgm3WFnPMMTXkKWeKq3sp5fajwzptV1MA/uS2aOuboQ7qm6J2aFy0yXQOr7nPNnNq2e/M/T2ugEMg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
@@ -96,8 +87,6 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.test.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.test.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.test.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for employees</md:ServiceName>
diff --git a/metadata/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml
index 091d0b31..92b37858 100644
--- a/metadata/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml
@@ -27,7 +27,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.utbildning.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.utbildning.ladok.se/Shibboleth.sso/Login" index="1"/>
@@ -53,15 +53,6 @@
           <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAIp99LvTbKyqMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNVBAMTF3d3dy51dGJpbGRuaW5nLmxhZG9rLnNlMB4XDTE3MDMyNDE0NDcyMFoXDTI3MDMyMjE0NDcyMFowIjEgMB4GA1UEAxMXd3d3LnV0YmlsZG5pbmcubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYI2lcthIZKs43KEJXYhwlRZfRHYehs0OOPRClgWVf1eH2CZtFuPoEFE7sXM5N16Ujfnqc8vVn5pbc60UHDrTsZvycIfH6CwcrBL1iJLdpMzMAk37StPY84dY5YVNfNnBIuQNuXQSNPw5sPPHkxiqM/BsUMnJZTAQsX7n+WaP/rshu5cmztYlcJ67kOYVcv3hzUFSrqO4Zrx+UZPZL9CFqOtkyJZaPVTjzsyKml3U1cuVbNsv1o4baFyWPXp//ddGwh3OMSTSPn3j8H5BHbVK6Hkh2wAEIqXUn+SNGoUX6QcQAALIzal5jocJ1iY+H3NHuqNBdfU+7OYtErBK5Y5dtAgMBAAGjbTBrMEoGA1UdEQRDMEGCF3d3dy51dGJpbGRuaW5nLmxhZG9rLnNlhiZodHRwczovL3d3dy51dGJpbGRuaW5nLmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQU2WCwheUwJClRqisBK/bkVSC212AwDQYJKoZIhvcNAQELBQADggEBAHnsRGKyoh54cx2ecnsC0RDxHB7j5Y8dybPpivA4SHgtDnbjb2jQh3c2d1UMi9N7ZOxnA5RnoSj0Hs3bkvWSvOMrKSxNincKtAsp9BBclf/PLDlSN625vn3rpKhjbYLYo3LHlBqg3wNbskqc+3opaiFJ8zkRcCwdlgNObUzE4szRlnJJbEMqq2XSHsSbp7wpvI5tWIuzKmlatN2uV6cdX8AgOf4/vWc5AAwt16j9gLyFepruXj1EV8ZjLmT282EDdyrMF/ZWwrd/jvN+gJiBff8D5IUrBcEMarP5A1p3ipvDHedGUgFhtjt8XSHJ5SaeBFZxhmvWPAGQQSA5AL5ESjY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
@@ -96,8 +87,6 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for employees</md:ServiceName>