--- DFN-AAI/https%3A%2F%2Ftekstlab.uio.no%2Fglossa2%2Fsaml%2Fmetadata.xml
+++ CLARIN IdP/https%3A%2F%2Ftekstlab.uio.no%2Fglossa2%2Fsaml%2Fmetadata.xml
@@ -1,39 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tekstlab.uio.no/glossa2/saml/metadata">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2020-12-21T08:05:06Z">
-      <RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/fileadmin/documents/mrps_dfn-aai_1.0.pdf</RegistrationPolicy>
-    </RegistrationInfo>
     <EntityAttributes xmlns="urn:oasis:names:tc:SAML:metadata:attribute">
       <Attribute xmlns="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">
+        <AttributeValue>http://clarin.eu/category/clarin-member</AttributeValue>
         <AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</AttributeValue>
         <AttributeValue>http://refeds.org/category/research-and-scholarship</AttributeValue>
-        <AttributeValue>http://clarin.eu/category/clarin-member</AttributeValue>
-      </Attribute>
-      <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:profiles:subject-id:req" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <AttributeValue>none</AttributeValue>
       </Attribute>
     </EntityAttributes>
   </Extensions>
   <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
+      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
+        <DisplayName xml:lang="en">The Glossa corpus search system</DisplayName>
+        <DisplayName xml:lang="de">Das Glossa-Korpus-Suchsystem</DisplayName>
+        <DisplayName xml:lang="fi">Glossa corpus -hakujärjestelmä</DisplayName>
+        <Description xml:lang="en">Glossa is a tool for researchers who want to search linguistically annotated corpora</Description>
+        <Description xml:lang="de">Glossa ist ein Werkzeug für Forscher, die linguistisch kommentierte Corpora suchen wollen</Description>
+        <Description xml:lang="fi">Glossa on työkalu tutkijoille, jotka haluavat etsiä kielellisesti merkityt korpukset</Description>
+        <Logo height="83" width="300">https://repo.clarino.uib.no/xmlui/themes/CLARINO/images/lindat/clarino-logo.png</Logo>
+        <InformationURL xml:lang="en">http://www.hf.uio.no/iln/english/about/organization/text-laboratory/news-events/2013/glossa/index.html</InformationURL>
+        <PrivacyStatementURL xml:lang="en">http://www.tekstlab.uio.no/clarino/privacy-policy.html</PrivacyStatementURL>
+      </UIInfo>
       <RequestInitiator xmlns="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://tekstlab.uio.no/glossa2/saml/login"/>
       <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://tekstlab.uio.no/glossa2/saml/login" index="1"/>
-      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="de">Das Glossa-Korpus-Suchsystem</DisplayName>
-        <DisplayName xml:lang="en">The Glossa corpus search system</DisplayName>
-        <Description xml:lang="de">Glossa ist ein Werkzeug für Forscher, die linguistisch kommentierte Corpora suchen wollen</Description>
-        <Description xml:lang="en">Glossa is a tool for researchers who want to search linguistically annotated corpora</Description>
-        <InformationURL xml:lang="en">http://www.hf.uio.no/iln/english/about/organization/text-laboratory/news-events/2013/glossa/index.html</InformationURL>
-        <Logo height="284" width="640">https://repo.clarino.uib.no/xmlui/themes/CLARINO/images/lindat/clarino-logo.png</Logo>
-        <PrivacyStatementURL xml:lang="en">http://www.tekstlab.uio.no/clarino/privacy-policy.html</PrivacyStatementURL>
-      </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <KeyName>tekstlab.uio.no</KeyName>
         <X509Data>
-          <X509SubjectName>CN=tekstlab.uio.no</X509SubjectName>
           <X509Certificate>MIID/zCCAmegAwIBAgIUN2aPzI61PzGB/qtNXn9ZlgjBan0wDQYJKoZIhvcNAQEL BQAwGjEYMBYGA1UEAxMPdGVrc3RsYWIudWlvLm5vMB4XDTIyMDMwMTEyMzkzNloX DTI3MDMyNTEyMzkzNlowGjEYMBYGA1UEAxMPdGVrc3RsYWIudWlvLm5vMIIBojAN BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAuwLtLYuH4VqY4Bcw5C4MERrEoprA wRT6j+Kc/L5ur1lAKHHRXmTF1fd1FtaBq2RNBgPy5OBf1i7gHVPsf4LCzafAcdPU vQzwCD+LqPbvFBocng//7xTpIOlQ2tkFoLBQv02OAjWZe1oJYp+o3SeiKfXBciIu NPzdkgCoZnttHN73aUt3PMKdVv9T/jPBvVHga4vGjv77jTTV/P+MaFaRCK788l2t MX1NpN5atlTUpPmzlBGZVTEEgQK9PNGESho4HwIA3ikIkTfYQ9FsgP+H3tnSYMj1 6KRrqsy3L02oOLV/HODCh6P787WQ0LZTW6XsiOGyy1+6RF4cRtv0k+4f48V+Q6dt jmg8Dn9P00jU1M4e2+MkYk+BGHBfPpPRYv5Eh5xjoNtKqiKcWWg0KO6zybBQhqu5 9sjvuEXVIvsfdd7hz+r0ZqNrAvBSHQA0dckBgRStx4r0JcEbzvmLbQ4nx2a/0KcA meB5C92f3n1WJX1SRUXB31Czfp/lVHBGQMaFAgMBAAGjPTA7MBoGA1UdEQQTMBGC D3Rla3N0bGFiLnVpby5ubzAdBgNVHQ4EFgQU2Ve7mvFEvcg6nUiE7C4xk3CPQNEw DQYJKoZIhvcNAQELBQADggGBAJDL8geNJcMbnh9O3V0QLhumrY0eeH0HHYy+2gGr esSoJsu82pFzTepZ92EjcLMsBE+Kn7rrkevy8OS4gTXq5lqK++iIaFhIq7hyok4O 4ch8L2NKSwwc2L/M5vbyb6Z49RftAOMuI89imMu6Ah8R03D9Cj8WeX7QN08JwrE9 /CUtYH3XHKPb4pyZBhNhCAZDIHC1oWuxzgrVSEpcSBu4zcXOakkBS8IWJboyDhF9 Cm1OupqQjZv4lOCgTyD9Bw8rZeRQK6evmIGAzzVWRYCpQwy6WeqsJqfvsmBi4+Id KqgJ8pGthM49v5weFFo5Yv/yv7Ny579u/QBQWxdtZjLxoEwZXV4OS8RAISZTYW7u Yuf6C4J9kgMI6Bg4yPw3pV8XpkjK5IchvtdFxs4z992iTepx8Vk17gZ3QKXsKyd5 L+H3EzjANf70aCLjlSubdtPaTlpd+97NcAZWnOnEEGGhkF8a23edE+9HBoLTX9Q/ BOrnH5xWGXYhKg9/e+cv5nMTpw==</X509Certificate>
         </X509Data>
       </KeyInfo>
@@ -41,37 +35,32 @@
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tekstlab.uio.no/glossa2/saml/logout"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tekstlab.uio.no/glossa2/saml/auth" index="1"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Das Glossa-Korpus-Suchsystem</ServiceName>
-      <ServiceName xml:lang="en">The Glossa corpus search system</ServiceName>
-      <ServiceDescription xml:lang="de">Glossa ist ein Werkzeug für Forscher, die linguistisch kommentierte Corpora suchen wollen</ServiceDescription>
+      <ServiceName xml:lang="en">Glossa, the corpus search and results handling system at the University of Oslo</ServiceName>
       <ServiceDescription xml:lang="en">Glossa is a tool for researchers who want to search linguistically annotated corpora</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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <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" isRequired="true"/>
+      <RequestedAttribute FriendlyName="edupersonprincipalname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="displayname" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="de">e459</OrganizationName>
-    <OrganizationName xml:lang="en">e459</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://clarin.eu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://clarin.eu</OrganizationURL>
+    <OrganizationName xml:lang="en">University of Oslo</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Oslo</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uio.no/</OrganizationURL>
   </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Kristin</GivenName>
-    <SurName>Hagen</SurName>
-    <EmailAddress>mailto:kristin.hagen@iln.uio.no</EmailAddress>
+  <ContactPerson contactType="technical">
+    <GivenName>Anders</GivenName>
+    <SurName>Nøklestad</SurName>
+    <EmailAddress>mailto:anders.noklestad@iln.uio.no</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <GivenName>Anders</GivenName>
     <SurName>Nøklestad</SurName>
     <EmailAddress>mailto:anders.noklestad@iln.uio.no</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Anders</GivenName>
-    <SurName>Nøklestad</SurName>
-    <EmailAddress>mailto:anders.noklestad@iln.uio.no</EmailAddress>
+  <ContactPerson contactType="administrative">
+    <GivenName>Kristin</GivenName>
+    <SurName>Hagen</SurName>
+    <EmailAddress>mailto:kristin.hagen@iln.uio.no</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>