SWAMID-3248: Updated SPs for Ladokmd-2023-10-26-v03

5 files changed, 152 insertions, 42 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 6e6f9c0d..f250b00e 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
@@ -19,6 +19,7 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
@@ -26,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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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"/>
@@ -35,15 +36,34 @@
         <mdui:DisplayName xml:lang="en">Ladok for employees ladok3-01.ladok.umu.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://ladok3-01.ladok.umu.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://ladok3-01.ladok.umu.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.start.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.start.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://ladok3-01.ladok.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>ladok3-01.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-01.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIJAMECDl0w1cg/MA0GCSqGSIb3DQEBCwUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMjIwODE5MTMxNjUwWhcNMzIwODE2MTMxNjUwWjAhMR8wHQYDVQQDDBZsYWRvazMtMDEubGFkb2sudW11LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwcl+Ekm2rS/oCjnkQXuTcgM0kjj2UFnzutUB2Gnz7vu4MG89XpXhbr7GPVaIi+VK7OcR5WQ73I+exqO9jFJb23qoIfGQBzdShxJdWCICeFuhr7jwsqjwwcX+UP9bR0yvCPoHebgphzi+oUXBNTNF7HoS862q6FhXAvYBvJapSLj8P/qXEMjps7BRZs8eCvTKsVWRd0BnWM1qFjSHfCvBqJvQzgQlgcJpf/Pn6pkqv3xJPokPGiFuQM0gPTrjJHA0GDMBLdTZLfHo8hx9ycNr6r/HQ1oMay+3yX9Chw6dQuxLlXirZTN19mwbmCymRZ84OCVFuAOa5y3CMimZdUEUv8AfS9Gfxs3t/VP7xcdufHGnjIpCd/cadn1wSGCOqmJ66UFtzQtRadMcpgVNHsz9Wy33CCqXBV1ApyQAyav++BUcjkfm+706ZL5tWpprYZGm1M4/0bcQpfXRySMZTRLXyAUHNgN1hefNUTgaZnaUrQJOkForUK+iiOO/R10gYK0r3cEHgLreDEJpN9jPiWRwox6NkEFVbvU6uHcM+qsbRKioZJ3pEcqpEUX2C7QGS6++uvLUT03PUafMoLf0t19rZj5T4cwjCMZ0ZMXgzquSPbXBhCbnnSAcygnVZBusHAJJ5uawUF3BWoDElfIYapPpzCSOf3nwfpcoXJUrbqqLq68CAwEAAaNQME4wHQYDVR0OBBYEFGDQrp6MVLYjkHCvRdKOGQB0NhIjMB8GA1UdIwQYMBaAFGDQrp6MVLYjkHCvRdKOGQB0NhIjMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAIPp/zbfikl/SMlWMb0NCJjSRGpL6GAzlTCDp0Blum8IqMdp4K5qGjdLwXUEiP0IUhlsEhsaB/WpHajzHpKLv/UWcf/orFAIo4jnpDPe7amZPSxyUmiiYREDNJs4Ia2vv4MwW13CmezHnlP5+5iHDCQ65CFtsti9TL6Q56T71/mzpu9Y7z6vZ3WvHNaO2MoSR3m8L4Evje3z70MsDkrcyQf/C3kjYzsNMScZbsbmNwWqAjRBnUSTQ5t0a7/PAoAJrNBm4myQdPs4G7inOqmnpSuXlc8p5TVi7cszoBhj100nd1W9FQvK3n74XnSnqRGU/nfDQO1HToFMBN2gQdPgjRC2WidM7YXQ4jckH7nbB3pLFvV7wuwo40w2S9mB2Hrh1fzlxUMtrqAYwKW6hoR+aKagSMVFF4rIV9gEB5a3sAmXa9m009sRuUoYVR4ljYS+oJfZAzfy31K2484baubDh/d/94DxkfSuX6fpkfGDCMKkzRQMrlq5lTaSknctFyx2jR166OUO7SQjGwEFwYpIDoP5VtQhQN73RsM8lFNsw8S0vy7xuM+n6AJxAFXKW2FMoA9UkOrH3gpCyvMuRcvQ61er9DIW3jc1lE4WjTyUnmipTdHFNzx30PJqKXOKT/Ot+fxbzKVkzAfKFRkX6JXL3eVD72dvK1jknPrPK1G53mE8</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>
         <ds:KeyName>https://ladok3-01.ladok.umu.se/gui-sp</ds:KeyName>
         <ds:KeyName>ladok3-01.ladok.umu.se</ds:KeyName>
@@ -71,6 +91,8 @@
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.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://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"/>
@@ -87,8 +109,8 @@
     </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.integrationstest.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml
index a9ad3dd9..2c85824c 100644
--- a/metadata/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.integrationstest.ladok.se-gui-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.integrationstest.ladok.se/gui-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-12-13T09:59:05Z">
-      <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"/>
@@ -22,11 +19,15 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-12-13T09:59:05Z">
+      <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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/Login" index="1"/>
@@ -35,15 +36,34 @@
         <mdui:DisplayName xml:lang="en">Ladok for employees www.integrationstest.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.integrationstest.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://www.integrationstest.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.start.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.start.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://www.integrationstest.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.integrationstest.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.integrationstest.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAOfifxZbao7mMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNVBAMTHXd3dy5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlMB4XDTE4MTIxMzA4NDMyN1oXDTI4MTIxMDA4NDMyN1owKDEmMCQGA1UEAxMdd3d3LmludGVncmF0aW9uc3Rlc3QubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5lmjzPJRC3fZ4VxhaY0VVGwp8swciwoSBQeO9NnGJ+IQfdmjxGme1MvIcpN0osEnah7kmljHczxmI0j52pmxtJblazB9KVTQBtmRXGUwJtS9j5xnMwdiE2JrMPX9SA+4TxgNGfwNr/5u6HJn06yzVpLagiCF5fabmkHQD7woMW7ewMca9CirzxKtOGT/x2kTTUpvVnY5oAMxoTZWSg1Y6tfx22Gh8zlIw1AePhWSqyTXPmO/z+b8/k8DjVDO/P7zbQrAxzoVZ6dc3xXf0974WaThs7wMCYYNAwSLSu8IAOaCg5R0M9aqqmTMw8Y9585Ioh6kMllYSVhpRW0mb8as3AgMBAAGjeTB3MFYGA1UdEQRPME2CHXd3dy5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlhixodHRwczovL3d3dy5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUqiaQksw8f2VI8MWBOvxje2xpp+0wDQYJKoZIhvcNAQELBQADggEBABQ7NHvIUTeNbepLr2t6OZBWpQZeKfG+zeoP6ehqth10MOE9atah+pzRgh8Lm4xR8RrMSxGfuv3TvMAwLul8jVKTCNsFHxbfp3GHmRB/DwScCYtSnW8pJot9CKiX7pFRPe8t5ExUh3utqSP6s93m7lVOpJwu+7b5W9F2X6THf4yNaOtPYXtaAmNx0VNANcpLhLXtgTnmtzzagaFYm+6vyMbA0cxUXzvp9us0+4xF966Lx/STbDuhpfCsE+Gg/8A2Byzz2lXfLSV0kjHxYnpybLISk/lhSTZ2jkjxg4jFRanM7+3107TsPXmOcNtzisOUhhodSkhOr9wBrs1RV2Cj/0M=</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>
         <ds:KeyName>https://www.integrationstest.ladok.se/gui-sp</ds:KeyName>
         <ds:KeyName>www.integrationstest.ladok.se</ds:KeyName>
@@ -71,6 +91,8 @@
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.integrationstest.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.integrationstest.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.integrationstest.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
@@ -87,8 +109,8 @@
     </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 d20af34b..60b6f519 100644
--- a/metadata/swamid-edugain/www.start.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.start.ladok.se-gui-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.start.ladok.se/gui-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"/>
@@ -22,15 +19,21 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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: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>
@@ -39,11 +42,28 @@
         <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 employees</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Ladok för personal</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>https://www.start.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.start.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.start.ladok.se</ds:X509SubjectName>
+          <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>
         <ds:KeyName>https://www.start.ladok.se/gui-sp</ds:KeyName>
         <ds:KeyName>www.start.ladok.se</ds:KeyName>
@@ -71,6 +91,8 @@
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.start.ladok.se/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.start.ladok.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.start.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.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"/>
@@ -87,8 +109,8 @@
     </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.test.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.test.ladok.se-gui-sp.xml
index f6f488a7..37362c58 100644
--- a/metadata/swamid-edugain/www.test.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.test.ladok.se-gui-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.test.ladok.se/gui-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-02-17T16:34:15Z">
-      <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"/>
@@ -22,11 +19,15 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-02-17T16:34:15Z">
+      <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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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"/>
@@ -35,15 +36,34 @@
         <mdui:DisplayName xml:lang="en">Ladok for employees www.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://www.test.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://www.test.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.start.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.start.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://www.test.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.test.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.test.ladok.se</ds:X509SubjectName>
+          <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>
         <ds:KeyName>https://www.test.ladok.se/gui-sp</ds:KeyName>
         <ds:KeyName>www.test.ladok.se</ds:KeyName>
@@ -71,6 +91,8 @@
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.ladok.se/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.ladok.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.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://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"/>
@@ -87,8 +109,8 @@
     </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.utbildning.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml
index d2017ff9..a7411bcc 100644
--- a/metadata/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.utbildning.ladok.se-gui-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.utbildning.ladok.se/gui-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"/>
@@ -22,11 +19,15 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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"/>
@@ -35,15 +36,34 @@
         <mdui:DisplayName xml:lang="en">Ladok for employees www.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://www.utbildning.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://www.utbildning.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.start.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.start.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://www.utbildning.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>www.utbildning.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.utbildning.ladok.se</ds:X509SubjectName>
+          <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>
         <ds:KeyName>https://www.utbildning.ladok.se/gui-sp</ds:KeyName>
         <ds:KeyName>www.utbildning.ladok.se</ds:KeyName>
@@ -71,6 +91,8 @@
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utbildning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utbildning.ladok.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.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://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"/>
@@ -87,8 +109,8 @@
     </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>