SWAMID-1073,1074,1075,1076,1077,1078

7 files changed, 155 insertions, 58 deletions

diff --git a/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index e197174f..ebbac4aa 100644
--- a/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -5,9 +5,8 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -18,6 +17,10 @@
         <mdui:DisplayName xml:lang="en">KAU.SE webbserver</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Logga in för att redigera innehållet på www.kau.se</mdui:Description>
         <mdui:Description xml:lang="en">Login to to create and edit content for www.kau.se</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.kau.se/en/about-university/contact/about-kause/about-web-site</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.kau.se/om-universitetet/kontakt/om-kause/om-webbsidan</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.kau.se/om-universitetet/kontakt/om-kause/kontakta-webbredaktionen/personuppgiftsbehandling-vid-karlstads</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.kau.se/en/about-university/contact/about-kause/contact-webmaster/processing-personal-data-karlstad-university</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -40,16 +43,28 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edit.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edit.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Karlstad University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karlstads universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.kau.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.kau.se/en</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Kommunikationsavdelningen</md:GivenName>
     <md:EmailAddress>mailto:webmaster@kau.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>Kommunikationsavdelningen</md:GivenName>
+    <md:GivenName>Kommunikationsavdelninen</md:GivenName>
     <md:EmailAddress>mailto:webmaster@kau.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>IT-avdelningen</md:GivenName>
     <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Incident Response Team, IT department</md:GivenName>
+    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/eduroamkonto.kau.se.xml b/swamid-2.0/eduroamkonto.kau.se.xml
index 10be68d7..885ee224 100644
--- a/swamid-2.0/eduroamkonto.kau.se.xml
+++ b/swamid-2.0/eduroamkonto.kau.se.xml
@@ -30,6 +30,10 @@
         <mdui:DisplayName xml:lang="en">eduroam account management - Karlstad University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Denna tjänst är till KAU anställda för återställning av eduroam lösenord</mdui:Description>
         <mdui:Description xml:lang="en">This service allows KAU employees to reset their eduroam password</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://inslaget.kau.se/stod-service/datorarbetsplatsen/atkomst-till-internet</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://inslaget.kau.se/stod-service/datorarbetsplatsen/atkomst-till-internet</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.kau.se/om-universitetet/kontakt/om-kause/kontakta-webbredaktionen/personuppgiftsbehandling-vid-karlstads</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.kau.se/en/about-university/contact/about-kause/contact-webmaster/processing-personal-data-karlstad-university</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -97,8 +101,28 @@ MipqdDjyQEIn6175q9gOmemKMbk=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://eduroamkonto-staging.kau.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduroamkonto-staging.kau.se/Shibboleth.sso/SAML2/POST" index="7"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Karlstad University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karlstads universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.kau.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.kau.se</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Incident Response Team, IT department</md:GivenName>
+    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml b/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml
index f77f9ad2..6d66f232 100644
--- a/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml
+++ b/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml
@@ -5,20 +5,23 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Inslaget - Karlstads universitet intranät</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Inslaget - Karlstad University intranet</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Välkommen till Inslaget, Karlstads universitets intranät. Här finns nyheter, information och dokument att ta del av för dig som anställd.</mdui:Description>
         <mdui:Description xml:lang="en">Welcome to Inslaget, the Karlstad University intranet. News, information and documents for employees.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://inslaget.kau.se/inslaget/fragor-och-svar-faq-0</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://inslaget.kau.se/inslaget/fragor-och-svar-faq-0</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.kau.se/om-universitetet/kontakt/om-kause/kontakta-webbredaktionen/personuppgiftsbehandling-vid-karlstads</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.kau.se/en/about-university/contact/about-kause/contact-webmaster/processing-personal-data-karlstad-university</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -42,6 +45,14 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/inslaget-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/inslaget-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Karlstad University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karlstads universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.kau.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.kau.se</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Kommunikationsavdelningen</md:GivenName>
     <md:EmailAddress>mailto:webmaster@kau.se</md:EmailAddress>
@@ -54,4 +65,8 @@
     <md:GivenName>IT-avdelningen</md:GivenName>
     <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Incident Response Team, IT department</md:GivenName>
+    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/jss.kau.se-8443-saml-metadata.xml b/swamid-2.0/jss.kau.se-8443-saml-metadata.xml
index 68bea593..602989ed 100644
--- a/swamid-2.0/jss.kau.se-8443-saml-metadata.xml
+++ b/swamid-2.0/jss.kau.se-8443-saml-metadata.xml
@@ -10,6 +10,12 @@
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">JAMF</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">JAMF</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Management of Apple devices at Karlstad University</mdui:Description>
+        <mdui:Description xml:lang="sv">Apple enhetshantering vid Karlstads universitet</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://inslaget.kau.se/stod-service/it-avdelningen/datorarbetsplatsen/dgd</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://inslaget.kau.se/stod-service/it-avdelningen/datorarbetsplatsen/dgd</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.kau.se/en/about-university/contact/about-kause/contact-webmaster/processing-personal-data-karlstad-university</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.kau.se/om-universitetet/kontakt/om-kause/kontakta-webbredaktionen/personuppgiftsbehandling-vid-karlstads</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -66,8 +72,8 @@ aiW9YrDCZsqRJoldPQACAmCsOfHpoR7gcKM3r0jSZsPfu3PAgikdJIWgowakx3xowMo=</ds:X509Cer
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jss.kau.se:8443/saml/SSO" index="0" isDefault="true"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">KAU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">KAU</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Karlstad University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karlstads universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.kau.se/en</md:OrganizationURL>
@@ -85,4 +91,8 @@ aiW9YrDCZsqRJoldPQACAmCsOfHpoR7gcKM3r0jSZsPfu3PAgikdJIWgowakx3xowMo=</ds:X509Cer
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Incident Response Team, IT department</md:GivenName>
+    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/sdauth.sciencedirect.com-.xml b/swamid-2.0/sdauth.sciencedirect.com-.xml
index 49acf6d7..28e6e9fd 100644
--- a/swamid-2.0/sdauth.sciencedirect.com-.xml
+++ b/swamid-2.0/sdauth.sciencedirect.com-.xml
@@ -5,13 +5,13 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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">
-    <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:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Elsevier</mdui:DisplayName>
         <mdui:Description xml:lang="en">Access Elsevier products using your institutional credentials</mdui:Description>
@@ -26,10 +26,12 @@
         <mdui:InformationURL xml:lang="en">https://www.elsevier.com/about</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.elsevier.com/legal/privacy-policy</mdui:PrivacyStatementURL>
         <!-- keyword strings are space-delimited. Spaces within individual keywords are encoded with a “plus” (+) character -->
-        <mdui:Keywords xml:lang="en">Elsevier Service Provider Identity Sign-in Login Single+Sign+On Publisher Access ScienceDirect Scopus ClinicalKey SciVal Reaxys Mendeley Embase Geofacets</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">Elsevier ScienceDirect Scopus ClinicalKey SciVal Reaxys Mendeley Embase Geofacets EngineeringVillage PharmaPendium</mdui:Keywords>
+        <mdui:Logo xml:lang="en" height="400" width="400">https://saml.elsevier.com/logos/elsevier-400x400.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="158" width="158">https://saml.elsevier.com/logos/elsevier-158x158.png</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <!--  Valid from Feb 05 2021 -->
         <ds:X509Data>
@@ -55,41 +57,41 @@ HL0Y8cbWSCgsg/Qpi0kb19bSPNLxAB4SAfvYqQSnD8cZOA==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
+    </md:KeyDescriptor>
     <!-- auth.elsevier.com is our preferred end-point for AssertionConsumerService Binding, sdauth.sciencedirect.com and shibauth.elsevier.com are maintained for backward compatibility only -->
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.elsevier.com/SHIRE/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.elsevier.com/SHIRE/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibauth.elsevier.com/SHIRE/SAML2/POST" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibauth.elsevier.com/SHIRE/SAML/POST" index="18"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.elsevier.com/SHIRE/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.elsevier.com/SHIRE/SAML/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE/SAML/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibauth.elsevier.com/SHIRE/SAML2/POST" index="17"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibauth.elsevier.com/SHIRE/SAML/POST" index="18"/>
     <!-- The following AssertionConsumerService Binding are for testing purposes only -->
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://certnx-shibauth-np.elsevier.com/SHIRE/SAML2/POST" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://certnx-shibauth-np.elsevier.com/SHIRE/SAML/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://loadcq-shibauth-np.elsevier.com/SHIRE/SAML2/POST" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://loadcq-shibauth-np.elsevier.com/SHIRE/SAML/POST" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://loadrc-shibauth-np.elsevier.com/SHIRE/SAML2/POST" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://loadrc-shibauth-np.elsevier.com/SHIRE/SAML/POST" index="22"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">Elsevier</ServiceName>
-      <ServiceDescription xml:lang="en">Access Elsevier products using your institutional credentials</ServiceDescription>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Elsevier B.V.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Elsevier</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.elsevier.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Elsevier Shibboleth Support</GivenName>
-    <EmailAddress>mailto:shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Elsevier Shibboleth Support</GivenName>
-    <EmailAddress>mailto:shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>Elsevier Security Incident Response</GivenName>
-    <EmailAddress>mailto:contentprotectionservices@elsevier.com</EmailAddress>
-  </ContactPerson>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://certnx-shibauth-np.elsevier.com/SHIRE/SAML2/POST" index="15"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://certnx-shibauth-np.elsevier.com/SHIRE/SAML/POST" index="16"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://loadcq-shibauth-np.elsevier.com/SHIRE/SAML2/POST" index="19"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://loadcq-shibauth-np.elsevier.com/SHIRE/SAML/POST" index="20"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://loadrc-shibauth-np.elsevier.com/SHIRE/SAML2/POST" index="21"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://loadrc-shibauth-np.elsevier.com/SHIRE/SAML/POST" index="22"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Elsevier</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Access Elsevier products using your institutional credentials</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Elsevier B.V.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Elsevier</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.elsevier.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Elsevier Shibboleth Support</md:GivenName>
+    <md:EmailAddress>mailto:shibbolethsupport@elsevier.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Elsevier Shibboleth Support</md:GivenName>
+    <md:EmailAddress>mailto:shibbolethsupport@elsevier.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Elsevier Security Incident Response</md:GivenName>
+    <md:EmailAddress>mailto:contentprotectionservices@elsevier.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/test-isp.sae.kau.se-isptest.xml b/swamid-2.0/test-isp.sae.kau.se-isptest.xml
index 2f3c4fbb..efa956c8 100644
--- a/swamid-2.0/test-isp.sae.kau.se-isptest.xml
+++ b/swamid-2.0/test-isp.sae.kau.se-isptest.xml
@@ -19,6 +19,8 @@
         <mdui:Description xml:lang="en">System for manangement of study plans for doctoral students at Karlstad University</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.kau.se/forskning/utbildning-pa-forskarniva/att-forska-vid-karlstads-universitet/handledning-och</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.kau.se/forskning/utbildning-pa-forskarniva/att-forska-vid-karlstads-universitet/handledning-och</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.kau.se/en/about-university/contact/about-kause/contact-webmaster/processing-personal-data-karlstad-university</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.kau.se/om-universitetet/kontakt/om-kause/kontakta-webbredaktionen/personuppgiftsbehandling-vid-karlstads</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
@@ -38,8 +40,8 @@
     <md:AssertionConsumerService index="0" isDefault="false" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-isp.sae.kau.se/isptest/saml/login_check"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">KAU</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">KAU</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Karlstad University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karlstads universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.kau.se/en</md:OrganizationURL>
@@ -57,4 +59,8 @@
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Incident Response Team, IT department</md:GivenName>
+    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www4.kau.se-isp.xml b/swamid-2.0/www4.kau.se-isp.xml
index 17310ae2..bfc368d0 100644
--- a/swamid-2.0/www4.kau.se-isp.xml
+++ b/swamid-2.0/www4.kau.se-isp.xml
@@ -5,9 +5,8 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -16,6 +15,12 @@
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Individuella studieplaner för doktorander</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Individual study plans for doctoral students</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://www4.kau.se/isp/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www4.kau.se/isp/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.kau.se/en/about-university/contact/about-kause/contact-webmaster/processing-personal-data-karlstad-university</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.kau.se/om-universitetet/kontakt/om-kause/kontakta-webbredaktionen/personuppgiftsbehandling-vid-karlstads</mdui:PrivacyStatementURL>
+        <mdui:Description xml:lang="en">Individual study plans for doctoral students</mdui:Description>
+        <mdui:Description xml:lang="sv">Individuella studieplaner för doktorander</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
@@ -34,8 +39,28 @@
     </md:KeyDescriptor>
     <md:AssertionConsumerService index="0" isDefault="false" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www4.kau.se/isp/saml/login_check"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Karlstad University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Karlstads universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.kau.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.kau.se</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Incident Response Team, IT department</md:GivenName>
+    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Tentamen</md:SurName>
+    <md:EmailAddress>mailto:tenta@kau.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>