Resolves SWAMIDOPS-12495 and SWAMIDOPS-12492

1 files changed, 112 insertions, 59 deletions

diff --git a/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml b/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
index b45eba7c..f2206016 100644
--- a/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
@@ -1,95 +1,148 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://login.idp.hhs.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://login.idp.hhs.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
       <shibmd:Scope regexp="false">hhs.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Handelshögskolan i Stockholm</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Stockholm School of Economics</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Handelshögskolan i Stockholm.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Stockholm School of Economics.</mdui:Description>
-        <mdui:Logo height="82" width="82">https://login.idp.hhs.se/idp/images/logo.png</mdui:Logo>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Stockholm School of Economics IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Handelshögskolan i Stockholm IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IdP for personnel and studentes</mdui:Description>
+        <mdui:Description xml:lang="sv">IdP för anställda och studenter</mdui:Description>
+        <mdui:Logo height="80" width="80">https://login.idp.hhs.se/images/Logo.png</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:IPHint>193.10.48.0/24</mdui:IPHint>
         <mdui:DomainHint>hhs.se</mdui:DomainHint>
         <mdui:GeolocationHint>geo:59.34161,18.05659</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </Extensions>
-    <KeyDescriptor>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPaVg+Pnce+JDTg4a490Fu28tq5UMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTQwMjE4MDgzNTI1
-WhcNMTcwMjE4MDgzNTI1WjAbMRkwFwYDVQQDExBsb2dpbi5pZHAuaGhzLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHfxE/NtoBdovpvyI+ShRpC9
-PvASzTQ7O2zsFwRsaooYlSeRxWq4jL4dyC7lm1Z5CPWgOAqcprYFkUI1wFhopOLU
-nYvqjc0jx8lSV9nqdSRC2MJrLbOS8V0CL8pAWeVbHE848nVeJS4elOr2EvYkZAij
-t78R/RvBJrVBpRKiAz1uvCGIyZ2HYt6bQBzWkG4L+pxC3z/ttjI2ql9ctWB3im00
-mzdmN7GW6bCQJlYWm8sy0iHI9Yt1aUMkXlBnrlUVNzq+cp+2hhuB7qy/XqhUVUMq
-PkBxpIkk6To2kCN+00uQP4oslomw3khz0GcrV88+nAIAAEeA3zrYbBvh05ABGQID
-AQABo2cwZTBEBgNVHREEPTA7ghBsb2dpbi5pZHAuaGhzLnNlhidodHRwczovL2xv
-Z2luLmlkcC5oaHMuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIMbKfamMiy4
-s3T84Lli4DWzkdIbMA0GCSqGSIb3DQEBBQUAA4IBAQBZt9RVrBFSfR+F5L+zPQrl
-3rTfcJXbivC8hWORCF3mFf3Z7nlOY/c/0LvOMK5pXF+gU50kjMhQ56mQHcmph9NC
-sabeqXJNDw7XlwUTYW4JkN8UpbaPvdeWKnWIUS/3zheqKIwbngkef1VqFLLtPOOw
-Io1509ayQEdBHOVmkC6dyzfy0eLoYOhFWlsP2PGaUkwx2IPEkZIT9HYKSO29vJLh
-Npezy9C4aa5Dvq92Chi9C4SVsjbeq2LNccaYLMj9Gt9HBOoQHNn8bcgKn1I17T9S
-UXquEqvQ92VtMjTxgKgQRmQKkzigbL4FehuxJaF/BrO8KcshRQQkqdQeUvmY1/QC</ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUJAzOpmO2xBQbVQy1TJip/WBcAkswDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQbG9naW4uaWRwLmhocy5zZTAeFw0xNzAzMjgyMDQ2NTBa
+Fw0zNzAzMjgyMTQ2NTBaMBsxGTAXBgNVBAMMEGxvZ2luLmlkcC5oaHMuc2UwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdkYCRoigh32xvgQEsqJNorU3r
+n14CtpCBfEQWkfY8OVvOFCccfnpdVm6bFTg5367D1LtlogNp6kjkGMoMoYOMs6wA
+c+ziDQ5M8UsnI6TMLM5LUr/M6oUIBr5xB/ZrL9TMADc6kmZNjVeovVsuBbkuosw5
+xE0PzRia4n/vnWzmiXvE00FU4c+b05a77kp8P0SivQdfLxL+Oth2Q1qV1wDFlyE7
+BEareYiTZ5LcGbmrkuLZ584kYMr1Vb1t/M4hLXNiW6Xe1fQQ+bzHV0qHKVqcIU3h
+ZPAy2XWz/5AOpQ3RVi0IOBKW0xBoIOOSrok1oMw7g1gQyTMDZPpL+WlqLgZTAgMB
+AAGjZzBlMB0GA1UdDgQWBBSOlOMkIfQHBMPzcvEI4mwXwVPnFzBEBgNVHREEPTA7
+ghBsb2dpbi5pZHAuaGhzLnNlhidodHRwczovL2xvZ2luLmlkcC5oaHMuc2UvaWRw
+L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGEfxzD6CZHwpyCTUW6+TaPN
+KJDT8fIBkxtbe6SYx2XHi25ZJyhxLAYePfwMlEkcnSPLxQuidoDwd0oAoweMe0o6
+OUzFeHZfJEdMTnnCsyH3oqj6PMuO3+n1tDFQL4pQAyy1IMECL9LQDCCX57NuzAtA
+5K5EqfvHy2GJ2rBSalWBdSB8bquAiMnlqESrCHy/E7ujWKdnNHpBhhZm6WoLQFnM
+TSSy2e+HiDVEbUGC9Bac3w5rVqWeiqjP138PypLRh/R2Vv2hlJQCPdw3kHrLBqyR
+QpllBNVAn2pqTcSFAvRQgXBMlR9ViRR3aZOzssWyFuL67Gl7Ldu5t3r8wbuWj8o=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVAIDhiVejQcRatRQTniI850BDMkdUMA0GCSqGSIb3DQEB
+CwUAMBsxGTAXBgNVBAMMEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTcwMzI4MjA0NjUw
+WhcNMzcwMzI4MjE0NjUwWjAbMRkwFwYDVQQDDBBsb2dpbi5pZHAuaGhzLnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiFEmWF2dWOwlv2JesUYtVQW+
+vwwA4Rgwvn2VUpOEc9F8Gq2VMiAeOEXvHqhc+KjbnBtYMM5IrW2zeRHO9G/JlvFf
+rkTTSVapkKpzpKhRfy3TdmknHYbpafo9GdyeDZCsg36kWLhbd+3jlgbef5Mjfy9r
+qPFDH/7WOHloLBeHAcGs7BOkst6Y7movgYAvTr99UsoCMIn87PECfTYIWHZQeC4j
+aDqTV/EwUOsToV7MgtHO64GJ7rpeymEztdovJbCNdCMPlJhFs1UD7uMQBVbCi9Q4
+v8aETkkQwuBLu1Fa7n6matWpdr3Cx7l1Ein/tSOKITmVFmJUZ+WaotFp0vNVKwID
+AQABo2cwZTAdBgNVHQ4EFgQU1Oa1WuVpep1YuQaeMEWqNENu4jwwRAYDVR0RBD0w
+O4IQbG9naW4uaWRwLmhocy5zZYYnaHR0cHM6Ly9sb2dpbi5pZHAuaGhzLnNlL2lk
+cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCGXNWNNlVTNlKn4GcUPKsf
+B4md2R5TZcSMvtkcPNvx0GJ70AXVeVgSQM0NoKngwctcvrgMB7aiYQllPG7u9MyO
+l49kEhucv7xqqQ28Tz2NQ0gglq4Ksxk9ZsYPT1ecUBQPn7v3fW0H8+FkPWqlhlvk
+NomzNmJo6MrF+4vxTM+HQfY4VbFzFAM+HVMeBWCNRq12xYPz7JXngVK+ODxSq1N4
+DBM626i4mIwyB1PrBNFljTS6AHEcx3YnjQJfhPNnsabiQyqqAcTEGx6xhRKpvm1G
+9Cye0sTM9olfUm5EUbf6TJngTZ2NJlinmddCI3Ov5LvWsB5HviOOyJ5mKH5fyJ2H
+                        </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.hhs.se/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se:8443/idp/profile/SAML2/SOAP/SLO"/>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.idp.hhs.se/idp/profile/Shibboleth/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.hhs.se/idp/profile/SAML2/Redirect/SSO"/>
   </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">hhs.se</shibmd:Scope>
     </Extensions>
-    <KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUJAzOpmO2xBQbVQy1TJip/WBcAkswDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQbG9naW4uaWRwLmhocy5zZTAeFw0xNzAzMjgyMDQ2NTBa
+Fw0zNzAzMjgyMTQ2NTBaMBsxGTAXBgNVBAMMEGxvZ2luLmlkcC5oaHMuc2UwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdkYCRoigh32xvgQEsqJNorU3r
+n14CtpCBfEQWkfY8OVvOFCccfnpdVm6bFTg5367D1LtlogNp6kjkGMoMoYOMs6wA
+c+ziDQ5M8UsnI6TMLM5LUr/M6oUIBr5xB/ZrL9TMADc6kmZNjVeovVsuBbkuosw5
+xE0PzRia4n/vnWzmiXvE00FU4c+b05a77kp8P0SivQdfLxL+Oth2Q1qV1wDFlyE7
+BEareYiTZ5LcGbmrkuLZ584kYMr1Vb1t/M4hLXNiW6Xe1fQQ+bzHV0qHKVqcIU3h
+ZPAy2XWz/5AOpQ3RVi0IOBKW0xBoIOOSrok1oMw7g1gQyTMDZPpL+WlqLgZTAgMB
+AAGjZzBlMB0GA1UdDgQWBBSOlOMkIfQHBMPzcvEI4mwXwVPnFzBEBgNVHREEPTA7
+ghBsb2dpbi5pZHAuaGhzLnNlhidodHRwczovL2xvZ2luLmlkcC5oaHMuc2UvaWRw
+L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGEfxzD6CZHwpyCTUW6+TaPN
+KJDT8fIBkxtbe6SYx2XHi25ZJyhxLAYePfwMlEkcnSPLxQuidoDwd0oAoweMe0o6
+OUzFeHZfJEdMTnnCsyH3oqj6PMuO3+n1tDFQL4pQAyy1IMECL9LQDCCX57NuzAtA
+5K5EqfvHy2GJ2rBSalWBdSB8bquAiMnlqESrCHy/E7ujWKdnNHpBhhZm6WoLQFnM
+TSSy2e+HiDVEbUGC9Bac3w5rVqWeiqjP138PypLRh/R2Vv2hlJQCPdw3kHrLBqyR
+QpllBNVAn2pqTcSFAvRQgXBMlR9ViRR3aZOzssWyFuL67Gl7Ldu5t3r8wbuWj8o=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPaVg+Pnce+JDTg4a490Fu28tq5UMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTQwMjE4MDgzNTI1
-WhcNMTcwMjE4MDgzNTI1WjAbMRkwFwYDVQQDExBsb2dpbi5pZHAuaGhzLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHfxE/NtoBdovpvyI+ShRpC9
-PvASzTQ7O2zsFwRsaooYlSeRxWq4jL4dyC7lm1Z5CPWgOAqcprYFkUI1wFhopOLU
-nYvqjc0jx8lSV9nqdSRC2MJrLbOS8V0CL8pAWeVbHE848nVeJS4elOr2EvYkZAij
-t78R/RvBJrVBpRKiAz1uvCGIyZ2HYt6bQBzWkG4L+pxC3z/ttjI2ql9ctWB3im00
-mzdmN7GW6bCQJlYWm8sy0iHI9Yt1aUMkXlBnrlUVNzq+cp+2hhuB7qy/XqhUVUMq
-PkBxpIkk6To2kCN+00uQP4oslomw3khz0GcrV88+nAIAAEeA3zrYbBvh05ABGQID
-AQABo2cwZTBEBgNVHREEPTA7ghBsb2dpbi5pZHAuaGhzLnNlhidodHRwczovL2xv
-Z2luLmlkcC5oaHMuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIMbKfamMiy4
-s3T84Lli4DWzkdIbMA0GCSqGSIb3DQEBBQUAA4IBAQBZt9RVrBFSfR+F5L+zPQrl
-3rTfcJXbivC8hWORCF3mFf3Z7nlOY/c/0LvOMK5pXF+gU50kjMhQ56mQHcmph9NC
-sabeqXJNDw7XlwUTYW4JkN8UpbaPvdeWKnWIUS/3zheqKIwbngkef1VqFLLtPOOw
-Io1509ayQEdBHOVmkC6dyzfy0eLoYOhFWlsP2PGaUkwx2IPEkZIT9HYKSO29vJLh
-Npezy9C4aa5Dvq92Chi9C4SVsjbeq2LNccaYLMj9Gt9HBOoQHNn8bcgKn1I17T9S
-UXquEqvQ92VtMjTxgKgQRmQKkzigbL4FehuxJaF/BrO8KcshRQQkqdQeUvmY1/QC</ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVAIDhiVejQcRatRQTniI850BDMkdUMA0GCSqGSIb3DQEB
+CwUAMBsxGTAXBgNVBAMMEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTcwMzI4MjA0NjUw
+WhcNMzcwMzI4MjE0NjUwWjAbMRkwFwYDVQQDDBBsb2dpbi5pZHAuaGhzLnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiFEmWF2dWOwlv2JesUYtVQW+
+vwwA4Rgwvn2VUpOEc9F8Gq2VMiAeOEXvHqhc+KjbnBtYMM5IrW2zeRHO9G/JlvFf
+rkTTSVapkKpzpKhRfy3TdmknHYbpafo9GdyeDZCsg36kWLhbd+3jlgbef5Mjfy9r
+qPFDH/7WOHloLBeHAcGs7BOkst6Y7movgYAvTr99UsoCMIn87PECfTYIWHZQeC4j
+aDqTV/EwUOsToV7MgtHO64GJ7rpeymEztdovJbCNdCMPlJhFs1UD7uMQBVbCi9Q4
+v8aETkkQwuBLu1Fa7n6matWpdr3Cx7l1Ein/tSOKITmVFmJUZ+WaotFp0vNVKwID
+AQABo2cwZTAdBgNVHQ4EFgQU1Oa1WuVpep1YuQaeMEWqNENu4jwwRAYDVR0RBD0w
+O4IQbG9naW4uaWRwLmhocy5zZYYnaHR0cHM6Ly9sb2dpbi5pZHAuaGhzLnNlL2lk
+cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCGXNWNNlVTNlKn4GcUPKsf
+B4md2R5TZcSMvtkcPNvx0GJ70AXVeVgSQM0NoKngwctcvrgMB7aiYQllPG7u9MyO
+l49kEhucv7xqqQ28Tz2NQ0gglq4Ksxk9ZsYPT1ecUBQPn7v3fW0H8+FkPWqlhlvk
+NomzNmJo6MrF+4vxTM+HQfY4VbFzFAM+HVMeBWCNRq12xYPz7JXngVK+ODxSq1N4
+DBM626i4mIwyB1PrBNFljTS6AHEcx3YnjQJfhPNnsabiQyqqAcTEGx6xhRKpvm1G
+9Cye0sTM9olfUm5EUbf6TJngTZ2NJlinmddCI3Ov5LvWsB5HviOOyJ5mKH5fyJ2H
+                        </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">HHS</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Stockholm School of Economics</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hhs.se</OrganizationURL>
+    <OrganizationName xml:lang="en">Stockholm School of Economics</OrganizationName>
+    <OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Stockholm School of Economics IdP</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm IdP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://www.hhs.se</OrganizationURL>
+    <OrganizationURL xml:lang="sv">https://www.hhs.se/sv/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-    <Company>Handelshögskolan i Stockholm</Company>
+    <EmailAddress>mailto:itsupport@hhs.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
     <EmailAddress>mailto:itsupport@hhs.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>