Add mailto: prefix to edugain IdPs and SPs

44 files changed, 117 insertions, 117 deletions

diff --git a/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
index fd429376..0b72f4c0 100644
--- a/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
@@ -83,19 +83,19 @@
   <ContactPerson contactType="administrative">
     <Company>Swedish Defence University</Company>
     <SurName>FHS IT Helpdesk</SurName>
-    <EmailAddress>helpdesk@fhs.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
     <TelephoneNumber>+46 8 55342545</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Swedish Defence University</Company>
     <SurName>FHS IT Helpdesk</SurName>
-    <EmailAddress>helpdesk@fhs.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
     <TelephoneNumber>+46 8 55342545</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Swedish Defence University</Company>
     <SurName>FHS IT Helpdesk</SurName>
-    <EmailAddress>helpdesk@fhs.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
     <TelephoneNumber>+46 08 55342545</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index cb40ab70..564f8a9e 100644
--- a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -59,6 +59,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>NORDUNet</md:GivenName>
     <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/e5.onthehub.com.xml b/swamid-2.0/e5.onthehub.com.xml
index 7e8436c6..c1c420e8 100644
--- a/swamid-2.0/e5.onthehub.com.xml
+++ b/swamid-2.0/e5.onthehub.com.xml
@@ -140,10 +140,10 @@ l8qQhkUldJphTqx2PEHORBM=
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Shibboleth Technical Team</md:GivenName>
-    <md:EmailAddress>Shibboleth@e-academy.com</md:EmailAddress>
+    <md:EmailAddress>mailto:Shibboleth@e-academy.com</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Shibboleth Administration Team</md:GivenName>
-    <md:EmailAddress>Shibboleth@e-academy.com</md:EmailAddress>
+    <md:EmailAddress>mailto:Shibboleth@e-academy.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
index 16a00571..da03a752 100644
--- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
@@ -505,13 +505,13 @@ G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</X509Certificate>
   <ContactPerson contactType="technical">
     <Company>Linköping University (ADFS)</Company>
     <SurName>Johan Peterson</SurName>
-    <EmailAddress>johan.peterson@liu.se</EmailAddress>
+    <EmailAddress>mailto:johan.peterson@liu.se</EmailAddress>
     <TelephoneNumber>+46 13 28 5730</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Linköping University (ADFS)</Company>
     <SurName>LiU-IT:s Kundcenter</SurName>
-    <EmailAddress>helpdesk@student.liu.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@student.liu.se</EmailAddress>
     <TelephoneNumber>+46 13 28 5898</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
index 5cd31580..32e8c3c7 100644
--- a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
+++ b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
@@ -102,19 +102,19 @@ icptKTpDxrRjfCXibBT1
   <ContactPerson contactType="administrative">
     <Company>The Swedish School of Sport and Health Sciences</Company>
     <SurName>Fredrik Nilsson</SurName>
-    <EmailAddress>fredrik.nilsson@gih.se</EmailAddress>
+    <EmailAddress>mailto:fredrik.nilsson@gih.se</EmailAddress>
     <TelephoneNumber>+46 8 12053734</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>The Swedish School of Sport and Health Sciences</Company>
     <SurName>Michael Thunell</SurName>
-    <EmailAddress>michael.thunell@gih.se</EmailAddress>
+    <EmailAddress>mailto:michael.thunell@gih.se</EmailAddress>
     <TelephoneNumber>+46 8 12053807</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>The Swedish School of Sport and Health Sciences</Company>
     <SurName>Charlie Skog</SurName>
-    <EmailAddress>charlie.skog@gih.se</EmailAddress>
+    <EmailAddress>mailto:charlie.skog@gih.se</EmailAddress>
     <TelephoneNumber>+46 8 12053792</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml b/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml
index f2ae5ddd..ed05fb1f 100644
--- a/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml
@@ -136,19 +136,19 @@ NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
   <ContactPerson contactType="administrative">
     <Company>University of Borås</Company>
     <SurName>IT-avdelningen</SurName>
-    <EmailAddress>it-avdelningen@hb.se</EmailAddress>
+    <EmailAddress>mailto:it-avdelningen@hb.se</EmailAddress>
     <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>University of Borås</Company>
     <SurName>Per-Olof Axelsson</SurName>
-    <EmailAddress>Per-Olof.Axelsson@hb.se</EmailAddress>
+    <EmailAddress>mailto:Per-Olof.Axelsson@hb.se</EmailAddress>
     <TelephoneNumber>+46 33 435 4697</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>University of Borås</Company>
     <SurName>IT-avdelningen</SurName>
-    <EmailAddress>it-avdelningen@hb.se</EmailAddress>
+    <EmailAddress>mailto:it-avdelningen@hb.se</EmailAddress>
     <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/identity.mdh.se-idp-shibboleth.xml b/swamid-2.0/identity.mdh.se-idp-shibboleth.xml
index 14eb3f5d..7a14fceb 100644
--- a/swamid-2.0/identity.mdh.se-idp-shibboleth.xml
+++ b/swamid-2.0/identity.mdh.se-idp-shibboleth.xml
@@ -101,19 +101,19 @@ P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
   <ContactPerson contactType="administrative">
     <Company>Mälardalen University</Company>
     <SurName>Peter Falck</SurName>
-    <EmailAddress>peter.falck@mdh.se</EmailAddress>
+    <EmailAddress>mailto:peter.falck@mdh.se</EmailAddress>
     <TelephoneNumber>+46 21 101499</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Mälardalen University</Company>
     <SurName>MDH Drift</SurName>
-    <EmailAddress>drift.ita@mdh.se</EmailAddress>
+    <EmailAddress>mailto:drift.ita@mdh.se</EmailAddress>
     <TelephoneNumber>+46 21 101499</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Mälardalen University</Company>
     <SurName>Helpdesk MDH</SurName>
-    <EmailAddress>helpdesk@mdh.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@mdh.se</EmailAddress>
     <TelephoneNumber>+46 16 101550</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
index 507f0e70..c58b6ca4 100644
--- a/swamid-2.0/idp.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
@@ -96,19 +96,19 @@ n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
   <ContactPerson contactType="administrative">
     <Company>Blekinge Institute of Technology- Personnel</Company>
     <SurName>IT Helpdesk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+    <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Blekinge Institute of Technology- Personnel</Company>
     <SurName>IT Helpdesk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+    <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Blekinge Institute of Technology- Personnel</Company>
     <SurName>IT Helpdesk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+    <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 381500</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
index 3e5c1ac6..ae573710 100644
--- a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
@@ -344,10 +344,10 @@
   </Organization>
   <ContactPerson contactType="technical">
     <Company>Chalmers</Company>
-    <EmailAddress>nrq@chalmers.se</EmailAddress>
+    <EmailAddress>mailto:nrq@chalmers.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Chalmers</Company>
-    <EmailAddress>biorn@chalmers.se</EmailAddress>
+    <EmailAddress>mailto:biorn@chalmers.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.hig.se-idp-shibboleth.xml b/swamid-2.0/idp.hig.se-idp-shibboleth.xml
index ea2380d9..ef1c7cb6 100644
--- a/swamid-2.0/idp.hig.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hig.se-idp-shibboleth.xml
@@ -102,19 +102,19 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
   <ContactPerson contactType="administrative">
     <Company>University of Gävle</Company>
     <SurName>Network Operations</SurName>
-    <EmailAddress>nat@hig.se</EmailAddress>
+    <EmailAddress>mailto:nat@hig.se</EmailAddress>
     <TelephoneNumber>+46 26 648500</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>University of Gävle</Company>
     <SurName>Operations</SurName>
-    <EmailAddress>nat@hig.se</EmailAddress>
+    <EmailAddress>mailto:nat@hig.se</EmailAddress>
     <TelephoneNumber>+46 26 648500</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>University of Gävle</Company>
     <SurName>IT Support</SurName>
-    <EmailAddress>itsupport@hig.se</EmailAddress>
+    <EmailAddress>mailto:itsupport@hig.se</EmailAddress>
     <TelephoneNumber>+46 26 648500</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.his.se-idp-shibboleth.xml b/swamid-2.0/idp.his.se-idp-shibboleth.xml
index f646dac8..ed12731a 100644
--- a/swamid-2.0/idp.his.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.his.se-idp-shibboleth.xml
@@ -106,19 +106,19 @@ drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ
   <ContactPerson contactType="administrative">
     <Company>University of Skövde</Company>
     <SurName>HiS Netadmin</SurName>
-    <EmailAddress>netadmin@his.se</EmailAddress>
+    <EmailAddress>mailto:netadmin@his.se</EmailAddress>
     <TelephoneNumber>+46 500 448800</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>University of Skövde</Company>
     <SurName>HiS Netadmin</SurName>
-    <EmailAddress>netadmin@his.se</EmailAddress>
+    <EmailAddress>mailto:netadmin@his.se</EmailAddress>
     <TelephoneNumber>+46 500 448800</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>University of Skövde</Company>
     <SurName>IT Helpdesk Högskolan i Skövde</SurName>
-    <EmailAddress>helpdesk@his.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@his.se</EmailAddress>
     <TelephoneNumber>+46 500 448800</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
index 4f796af3..ea0270b2 100644
--- a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
@@ -111,19 +111,19 @@ kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
   <ContactPerson contactType="administrative">
     <Company>Högskolan Kristianstad</Company>
     <SurName>Service desk 3030</SurName>
-    <EmailAddress>3030@hkr.se</EmailAddress>
+    <EmailAddress>mailto:3030@hkr.se</EmailAddress>
     <TelephoneNumber>+46 44 20 3030</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Högskolan Kristianstad</Company>
     <SurName>Service desk 3030</SurName>
-    <EmailAddress>3030@hkr.se</EmailAddress>
+    <EmailAddress>mailto:3030@hkr.se</EmailAddress>
     <TelephoneNumber>+46 44 20 3030</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Högskolan Kristianstad</Company>
     <SurName>Service desk 3030</SurName>
-    <EmailAddress>3030@hkr.se</EmailAddress>
+    <EmailAddress>mailto:3030@hkr.se</EmailAddress>
     <TelephoneNumber>+46 44 20 3030</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
index 33ef79b1..ae28e676 100644
--- a/swamid-2.0/idp.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
@@ -101,19 +101,19 @@ XCYbfP8E3cs4MB+K
   <ContactPerson contactType="administrative">
     <Company>Swedish Institute of Space Physics</Company>
     <SurName>Mats Luspa</SurName>
-    <EmailAddress>datagruppen@irf.se</EmailAddress>
+    <EmailAddress>mailto:datagruppen@irf.se</EmailAddress>
     <TelephoneNumber>+4698079000</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Swedish Institute of Space Physics</Company>
     <SurName>Mats Luspa</SurName>
-    <EmailAddress>matsl@irf.se</EmailAddress>
+    <EmailAddress>mailto:matsl@irf.se</EmailAddress>
     <TelephoneNumber>+4698079022</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Swedish Institute of Space Physics</Company>
     <SurName>Mats Luspa</SurName>
-    <EmailAddress>matsl@irf.se</EmailAddress>
+    <EmailAddress>mailto:matsl@irf.se</EmailAddress>
     <TelephoneNumber>+4698079022</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml
index 1f7fe006..0a07e3ca 100644
--- a/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml
@@ -97,18 +97,18 @@ MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
   <ContactPerson contactType="administrative">
     <Company>University of Gothenburg</Company>
     <SurName>Lena Ström</SurName>
-    <EmailAddress>lena.strom@gu.se</EmailAddress>
+    <EmailAddress>mailto:lena.strom@gu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>University of Gothenburg</Company>
     <SurName>Pablo Millet</SurName>
-    <EmailAddress>pablo.millet@gu.se</EmailAddress>
+    <EmailAddress>mailto:pablo.millet@gu.se</EmailAddress>
     <TelephoneNumber>+46707104070</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>University of Gothenburg</Company>
     <SurName>GU-Support</SurName>
-    <EmailAddress>support@gu.se</EmailAddress>
+    <EmailAddress>mailto:support@gu.se</EmailAddress>
     <TelephoneNumber>+46317862020</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
index 539dabea..920b44f6 100644
--- a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
@@ -91,19 +91,19 @@ VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
   <ContactPerson contactType="administrative">
     <Company>Stockholm University</Company>
     <SurName>Helpdesk</SurName>
-    <EmailAddress>helpdesk@su.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
     <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Stockholm University</Company>
     <SurName>Helpdesk</SurName>
-    <EmailAddress>helpdesk@su.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
     <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Stockholm University</Company>
     <SurName>Helpdesk</SurName>
-    <EmailAddress>helpdesk@su.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
     <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.kb.se-idp-shibboleth.xml b/swamid-2.0/idp.kb.se-idp-shibboleth.xml
index 0613535b..ee1ba4d1 100644
--- a/swamid-2.0/idp.kb.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kb.se-idp-shibboleth.xml
@@ -199,19 +199,19 @@ hJ2GrICmdWsVIb88lmoEw8Hn/ew=
   <ContactPerson contactType="administrative">
     <Company>National Library of Sweden</Company>
     <SurName>Mattias Olsson</SurName>
-    <EmailAddress>mattias.olsson@kb.se</EmailAddress>
+    <EmailAddress>mailto:mattias.olsson@kb.se</EmailAddress>
     <TelephoneNumber>+46700073534</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>National Library of Sweden</Company>
     <SurName>Mattias Olsson</SurName>
-    <EmailAddress>swamid@kb.se</EmailAddress>
+    <EmailAddress>mailto:swamid@kb.se</EmailAddress>
     <TelephoneNumber>+46700073534</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>National Library of Sweden</Company>
     <SurName>swamid@kb.se</SurName>
-    <EmailAddress>swamid@kb.se</EmailAddress>
+    <EmailAddress>mailto:swamid@kb.se</EmailAddress>
     <TelephoneNumber>+46700073555</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.kkh.se-idp-shibboleth.xml b/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
index 25394713..82fbcfb6 100644
--- a/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
@@ -99,19 +99,19 @@ qowogArC+4U1+wcq4ctUoM0Lyh5YaTMs4U31GcmYAotsLw+sY97V0WGQKffURz4f
   <ContactPerson contactType="administrative">
     <Company>Kungl. Konsthögskolan</Company>
     <SurName>Fredrik Reuterswärd</SurName>
-    <EmailAddress>fredrik.reutersward@kkh.se</EmailAddress>
+    <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
     <TelephoneNumber>+4686144064</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Kungl. Konsthögskolan</Company>
     <SurName>Fredrik Reuterswärd</SurName>
-    <EmailAddress>fredrik.reutersward@kkh.se</EmailAddress>
+    <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
     <TelephoneNumber>+4686144064</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Kungl. Konsthögskolan</Company>
     <SurName>Fredrik Reuterswärd</SurName>
-    <EmailAddress>fredrik.reutersward@kkh.se</EmailAddress>
+    <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
     <TelephoneNumber>+4686144064</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
index 7f3ca0ce..b6dc9d91 100644
--- a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
@@ -99,17 +99,17 @@ SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
   <ContactPerson contactType="administrative">
     <Company>Royal College of Music</Company>
     <SurName>KMH IT-avdelningen</SurName>
-    <EmailAddress>swamid@kmh.se</EmailAddress>
+    <EmailAddress>mailto:swamid@kmh.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Royal College of Music</Company>
     <SurName>KMH IT-avdelningen</SurName>
-    <EmailAddress>swamid@kmh.se</EmailAddress>
+    <EmailAddress>mailto:swamid@kmh.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Royal College of Music</Company>
     <SurName>KMH IT HelpDesk</SurName>
-    <EmailAddress>helpdesk@kmh.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@kmh.se</EmailAddress>
     <TelephoneNumber>+46 8 161939</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.konstfack.se-idp-shibboleth.xml b/swamid-2.0/idp.konstfack.se-idp-shibboleth.xml
index 0c4283e8..b5c8f962 100644
--- a/swamid-2.0/idp.konstfack.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.konstfack.se-idp-shibboleth.xml
@@ -97,19 +97,19 @@ SHHQuQC8v/yTq6ZVFlRvTNkZ+W/vPYOeE6x49Dygeu65WDf/H2NUy6dggcmH+LpS</ds:X509Certifi
   <ContactPerson contactType="administrative">
     <Company>Konstfack</Company>
     <SurName>Håkan Pettersson</SurName>
-    <EmailAddress>hakan.pettersson@konstfack.se</EmailAddress>
+    <EmailAddress>mailto:hakan.pettersson@konstfack.se</EmailAddress>
     <TelephoneNumber>+46 8 4504396</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Konstfack</Company>
     <SurName>Håkan Pettersson</SurName>
-    <EmailAddress>hakan.pettersson@konstfack.se</EmailAddress>
+    <EmailAddress>mailto:hakan.pettersson@konstfack.se</EmailAddress>
     <TelephoneNumber>+46 8 4504396</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Konstfack</Company>
     <SurName>Helpdesk IT Konstfack</SurName>
-    <EmailAddress>helpdesk@konstfack.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@konstfack.se</EmailAddress>
     <TelephoneNumber>+46 8 450 4399</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.kva.se-idp-shibboleth.xml b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
index 8d10830a..1be5aabf 100644
--- a/swamid-2.0/idp.kva.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
@@ -98,17 +98,17 @@ y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
   </Organization>
   <ContactPerson contactType="administrative">
     <Company>The Royal Swedish Academy of Sciences</Company>
-    <EmailAddress>peter.jacobsson@kva.se</EmailAddress>
+    <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
     <TelephoneNumber>+46 70 6739792</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>The Royal Swedish Academy of Sciences</Company>
-    <EmailAddress>peter.jacobsson@kva.se</EmailAddress>
+    <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
     <TelephoneNumber>+46 70 6739792</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>The Royal Swedish Academy of Sciences</Company>
-    <EmailAddress>peter.jacobsson@kva.se</EmailAddress>
+    <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
     <TelephoneNumber>+46 70 6739792</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.lnu.se-idp-shibboleth.xml b/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
index d619ea04..38b9e0f0 100644
--- a/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
@@ -116,6 +116,6 @@ nsANXWIYSHmsKeMX/1M+TqMOmUCOExgqTr4yHou54m2SdxcMGJgJp2jcmdF6gbjo
   </Organization>
   <ContactPerson contactType="technical">
     <Company>Linnæus University</Company>
-    <EmailAddress>it.idp@lnu.se</EmailAddress>
+    <EmailAddress>mailto:it.idp@lnu.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
index 5f1a0abe..958a4841 100644
--- a/swamid-2.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
@@ -101,19 +101,19 @@ dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
   <ContactPerson contactType="administrative">
     <Company>Malmö University</Company>
     <SurName>IT Drift</SurName>
-    <EmailAddress>drift@mah.se</EmailAddress>
+    <EmailAddress>mailto:drift@mah.se</EmailAddress>
     <TelephoneNumber>+46 709 655480</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Malmö University</Company>
     <SurName>Robert Faling</SurName>
-    <EmailAddress>robert.faling@mah.se</EmailAddress>
+    <EmailAddress>mailto:robert.faling@mah.se</EmailAddress>
     <TelephoneNumber>+46 768 428753</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Malmö University</Company>
     <SurName>Servicedesk Malmö högskola</SurName>
-    <EmailAddress>support@mah.se</EmailAddress>
+    <EmailAddress>mailto:support@mah.se</EmailAddress>
     <TelephoneNumber>+46 40 6657555</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
index 38f73071..8b857da0 100644
--- a/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
+++ b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
@@ -95,15 +95,15 @@ JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
   <ContactPerson contactType="administrative">
     <Company>NORDUnet</Company>
     <SurName>noc@nordu.net</SurName>
-    <EmailAddress>noc@nordu.net</EmailAddress>
+    <EmailAddress>mailto:noc@nordu.net</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>NORDUnet</Company>
-    <EmailAddress>noc@nordu.net</EmailAddress>
+    <EmailAddress>mailto:noc@nordu.net</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>NORDUnet</Company>
     <SurName>NUNOC</SurName>
-    <EmailAddress>noc@nordu.net</EmailAddress>
+    <EmailAddress>mailto:noc@nordu.net</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.rkh.se-idp-shibboleth.xml b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
index 2e83de39..b7eebaeb 100644
--- a/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
@@ -91,18 +91,18 @@ MH7l5Ii1TxKGmGspEIChPmEAY1ntIV8=</ds:X509Certificate>
   <ContactPerson contactType="administrative">
     <Company>Swedish Red Cross University College</Company>
     <SurName>IT-support</SurName>
-    <EmailAddress>servicedesk@rkh.se</EmailAddress>
+    <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
     <TelephoneNumber>+46858751607/+46858751603</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Swedish Red Cross University College</Company>
     <SurName>IT-support</SurName>
-    <EmailAddress>servicedesk@rkh.se</EmailAddress>
+    <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
     <TelephoneNumber>+46858751607</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Swedish Red Cross University College</Company>
     <SurName>IT-Support Röda Korsets Högskola</SurName>
-    <EmailAddress>servicedesk@rkh.se</EmailAddress>
+    <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.sics.se-idp-shibboleth.xml b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
index ddfbf228..6d4f068a 100644
--- a/swamid-2.0/idp.sics.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
@@ -120,6 +120,6 @@ SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
   <ContactPerson contactType="technical">
     <Company>SICS</Company>
     <SurName>CRIT</SurName>
-    <EmailAddress>crit@sics.se</EmailAddress>
+    <EmailAddress>mailto:crit@sics.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
index 8ba6db17..d7af3a09 100644
--- a/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
@@ -92,19 +92,19 @@ nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
   <ContactPerson contactType="administrative">
     <Company>Blekinge Institute of Technology - Students</Company>
     <SurName>IT Help Desk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+    <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Blekinge Institute of Technology - Students</Company>
     <SurName>IT Help Desk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+    <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Blekinge Institute of Technology - Students</Company>
     <SurName>IT Help Desk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+    <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.suni.se-adfs-services-trust.xml b/swamid-2.0/idp.suni.se-adfs-services-trust.xml
index 518df523..bbb025b1 100644
--- a/swamid-2.0/idp.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.suni.se-adfs-services-trust.xml
@@ -67,7 +67,7 @@
   <ContactPerson contactType="support">
     <GivenName>Tomas</GivenName>
     <SurName>Legat</SurName>
-    <EmailAddress>server@sh.se</EmailAddress>
+    <EmailAddress>mailto:server@sh.se</EmailAddress>
     <TelephoneNumber>+46(0)86084000</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml b/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
index adae6b1a..1e317c3e 100644
--- a/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
@@ -51,19 +51,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>Umeå University</md:Company>
     <md:SurName>ITS datordrift</md:SurName>
-    <md:EmailAddress>datordrift@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>Umeå University</md:Company>
     <md:SurName>ITS datordrift</md:SurName>
-    <md:EmailAddress>datordrift@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Umeå University</md:Company>
     <md:SurName>Servicedesk Umeå universitet</md:SurName>
-    <md:EmailAddress>support@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp2.hig.se-idp-shibboleth.xml b/swamid-2.0/idp2.hig.se-idp-shibboleth.xml
index 0b39b408..634b3596 100644
--- a/swamid-2.0/idp2.hig.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.hig.se-idp-shibboleth.xml
@@ -92,19 +92,19 @@ aaB0gTNGMOhF/MSYfiM8SNzVxiYnaE8rwQZK
   <ContactPerson contactType="administrative">
     <Company>University of Gävle (Alumni)</Company>
     <SurName>Network Operations</SurName>
-    <EmailAddress>nat@hig.se</EmailAddress>
+    <EmailAddress>mailto:nat@hig.se</EmailAddress>
     <TelephoneNumber>+46 26 648500</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>University of Gävle (Alumni)</Company>
     <SurName>Network Operations</SurName>
-    <EmailAddress>nat@hig.se</EmailAddress>
+    <EmailAddress>mailto:nat@hig.se</EmailAddress>
     <TelephoneNumber>+46 26 648500</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>University of Gävle (Alumni)</Company>
     <SurName>IT Support</SurName>
-    <EmailAddress>itsupport@hig.se</EmailAddress>
+    <EmailAddress>mailto:itsupport@hig.se</EmailAddress>
     <TelephoneNumber>+46 26 648500</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp2.hv.se-idp-shibboleth.xml b/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
index 6993b0fd..0a923a72 100644
--- a/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
@@ -107,19 +107,19 @@ aRQKNbVQdPN5ht6TrINjDQ==
   <ContactPerson contactType="administrative">
     <Company>University West</Company>
     <SurName>Magnus Andersson</SurName>
-    <EmailAddress>Magnus.Andersson@hv.se</EmailAddress>
+    <EmailAddress>mailto:Magnus.Andersson@hv.se</EmailAddress>
     <TelephoneNumber>+46 520 223193</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>University West</Company>
     <SurName>Christian Jiresjö</SurName>
-    <EmailAddress>Christian.Jiresjo@hv.se</EmailAddress>
+    <EmailAddress>mailto:Christian.Jiresjo@hv.se</EmailAddress>
     <TelephoneNumber>+46 520 223189</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>University West</Company>
     <SurName>Servicedesk Högkoslan Väst</SurName>
-    <EmailAddress>servicedesk@hv.se</EmailAddress>
+    <EmailAddress>mailto:servicedesk@hv.se</EmailAddress>
     <TelephoneNumber>+46 520 223300</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml b/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml
index d394505d..cfe173af 100644
--- a/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml
+++ b/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml
@@ -110,19 +110,19 @@ uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
   <md:ContactPerson contactType="administrative">
     <md:Company>Karolinska Institutet</md:Company>
     <md:SurName>Malin Westerberg</md:SurName>
-    <md:EmailAddress>malin.westerberg@ki.se</md:EmailAddress>
+    <md:EmailAddress>mailto:malin.westerberg@ki.se</md:EmailAddress>
     <md:TelephoneNumber>+46 8 524 86693</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>Karolinska Institutet</md:Company>
     <md:SurName>Eric Johansson</md:SurName>
-    <md:EmailAddress>eric.johansson@ki.se</md:EmailAddress>
+    <md:EmailAddress>mailto:eric.johansson@ki.se</md:EmailAddress>
     <md:TelephoneNumber>+46 8 524 86382</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Karolinska Institutet</md:Company>
     <md:SurName>IT-support</md:SurName>
-    <md:EmailAddress>it-support@ki.se</md:EmailAddress>
+    <md:EmailAddress>mailto:it-support@ki.se</md:EmailAddress>
     <md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/login.du.se-idp-shibboleth.xml b/swamid-2.0/login.du.se-idp-shibboleth.xml
index bb4e4820..5dadc0d4 100644
--- a/swamid-2.0/login.du.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.du.se-idp-shibboleth.xml
@@ -99,19 +99,19 @@ GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
   <ContactPerson contactType="administrative">
     <Company>Dalarna University</Company>
     <SurName>IT-avdelningen</SurName>
-    <EmailAddress>shib-admin@du.se</EmailAddress>
+    <EmailAddress>mailto:shib-admin@du.se</EmailAddress>
     <TelephoneNumber>+46 23 778891</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Dalarna University</Company>
     <SurName>IT-avdelningen</SurName>
-    <EmailAddress>shib-admin@du.se</EmailAddress>
+    <EmailAddress>mailto:shib-admin@du.se</EmailAddress>
     <TelephoneNumber>+46 23 778891</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Dalarna University</Company>
     <SurName>Högskolan Dalarna Support</SurName>
-    <EmailAddress>support@du.se</EmailAddress>
+    <EmailAddress>mailto:support@du.se</EmailAddress>
     <TelephoneNumber>+46 23 778888</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/login.idp.eduid.se-idp.xml.xml b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
index 64d4ff34..469c6894 100644
--- a/swamid-2.0/login.idp.eduid.se-idp.xml.xml
+++ b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
@@ -86,17 +86,17 @@ iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
   <ns0:ContactPerson contactType="administrative">
     <ns0:Company>eduID</ns0:Company>
     <ns0:SurName>Valter Nordh</ns0:SurName>
-    <ns0:EmailAddress>valter@sunet.se</ns0:EmailAddress>
+    <ns0:EmailAddress>mailto:valter@sunet.se</ns0:EmailAddress>
     <ns0:TelephoneNumber>+46707884742</ns0:TelephoneNumber>
   </ns0:ContactPerson>
   <ns0:ContactPerson contactType="technical">
     <ns0:Company>eduID</ns0:Company>
     <ns0:SurName>SUNET eduID team</ns0:SurName>
-    <ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
+    <ns0:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
   </ns0:ContactPerson>
   <ns0:ContactPerson contactType="support">
     <ns0:Company>eduID</ns0:Company>
     <ns0:SurName>eduID Support</ns0:SurName>
-    <ns0:EmailAddress>support@eduid.se</ns0:EmailAddress>
+    <ns0:EmailAddress>mailto:support@eduid.se</ns0:EmailAddress>
   </ns0:ContactPerson>
 </ns0:EntityDescriptor>
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 dd3d8662..b45eba7c 100644
--- a/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
@@ -90,6 +90,6 @@ UXquEqvQ92VtMjTxgKgQRmQKkzigbL4FehuxJaF/BrO8KcshRQQkqdQeUvmY1/QC</ds:X509Certifi
   </Organization>
   <ContactPerson contactType="technical">
     <Company>Handelshögskolan i Stockholm</Company>
-    <EmailAddress>itsupport@hhs.se</EmailAddress>
+    <EmailAddress>mailto:itsupport@hhs.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/login.liu.se-idp-shibboleth.xml b/swamid-2.0/login.liu.se-idp-shibboleth.xml
index a331e59a..b1e913ea 100644
--- a/swamid-2.0/login.liu.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.liu.se-idp-shibboleth.xml
@@ -104,17 +104,17 @@ dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
   <ContactPerson contactType="administrative">
     <Company>Linköping University</Company>
     <SurName>LiU-IT SAML admins</SurName>
-    <EmailAddress>saml-admins@it.liu.se</EmailAddress>
+    <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Linköping University</Company>
     <SurName>LiU-IT SAML admins</SurName>
-    <EmailAddress>saml-admins@it.liu.se</EmailAddress>
+    <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Linköping University</Company>
     <SurName>LiU-IT Helpdesk</SurName>
-    <EmailAddress>helpdesk@liu.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@liu.se</EmailAddress>
     <TelephoneNumber>+46 13 282828</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
index 8706b1ee..4b963b74 100644
--- a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
@@ -120,19 +120,19 @@ x7JUFw==</ds:X509Certificate>
   <ContactPerson contactType="administrative">
     <Company>KTH Royal Institute of Technology</Company>
     <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
-    <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
+    <EmailAddress>mailto:ita-infra-saml-contact@kth.se</EmailAddress>
     <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>KTH Royal Institute of Technology</Company>
     <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
-    <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
+    <EmailAddress>mailto:ita-infra-saml-contact@kth.se</EmailAddress>
     <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>KTH Royal Institute of Technology</Company>
     <SurName>KTH IT-Support</SurName>
-    <EmailAddress>it-support@kth.se</EmailAddress>
+    <EmailAddress>mailto:it-support@kth.se</EmailAddress>
     <TelephoneNumber>+46 8 790 6600</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
index e142e8fd..8f1fa422 100644
--- a/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
@@ -94,19 +94,19 @@ Pz8R3A==</ds:X509Certificate>
   <ContactPerson contactType="administrative">
     <Company>Örebro University</Company>
     <SurName>IT Avdelningen</SurName>
-    <EmailAddress>itsupport@oru.se</EmailAddress>
+    <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
     <TelephoneNumber>+46 19 303166</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Örebro University</Company>
     <SurName>Jonny Ehrnberg</SurName>
-    <EmailAddress>jonny.ehrnberg@oru.se</EmailAddress>
+    <EmailAddress>mailto:jonny.ehrnberg@oru.se</EmailAddress>
     <TelephoneNumber>+46 19 303851</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Örebro University</Company>
     <SurName>IT Avdelningen Örebro universitet</SurName>
-    <EmailAddress>itsupport@oru.se</EmailAddress>
+    <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
     <TelephoneNumber>+46 19 303166</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml b/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml
index 2a12307d..f8948f08 100644
--- a/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml
@@ -101,19 +101,19 @@ nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
   <ContactPerson contactType="administrative">
     <Company>Jönköping University</Company>
     <SurName>Joakim Danielsson</SurName>
-    <EmailAddress>Joakim.Danielsson@hj.se</EmailAddress>
+    <EmailAddress>mailto:Joakim.Danielsson@hj.se</EmailAddress>
     <TelephoneNumber>+46 36 101116</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Jönköping University</Company>
     <SurName>Stefan Kindh</SurName>
-    <EmailAddress>Stefan.Kindh@hj.se</EmailAddress>
+    <EmailAddress>mailto:Stefan.Kindh@hj.se</EmailAddress>
     <TelephoneNumber>+46 36 101170</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Jönköping University</Company>
     <SurName>IT-Helpdesk</SurName>
-    <EmailAddress>helpdesk@hj.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@hj.se</EmailAddress>
     <TelephoneNumber>+46 36 101112</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
index 7293f8f5..a01a2afd 100644
--- a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
@@ -97,19 +97,19 @@ B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
   <ContactPerson contactType="administrative">
     <Company>Lulea University of Technology</Company>
     <SurName>LTU Servicedesk</SurName>
-    <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+    <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
     <TelephoneNumber>+46 920 491664</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Lulea University of Technology</Company>
     <SurName>LTU Servicedesk</SurName>
-    <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+    <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
     <TelephoneNumber>+46 920 491664</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Lulea University of Technology</Company>
     <SurName>LTU Servicedesk</SurName>
-    <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+    <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
     <TelephoneNumber>+46 920 491664</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/signon.hh.se-idp-shibboleth.xml b/swamid-2.0/signon.hh.se-idp-shibboleth.xml
index 91fdcccb..4a0dae4e 100644
--- a/swamid-2.0/signon.hh.se-idp-shibboleth.xml
+++ b/swamid-2.0/signon.hh.se-idp-shibboleth.xml
@@ -103,19 +103,19 @@ CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
   <ContactPerson contactType="administrative">
     <Company>Halmstad University</Company>
     <SurName>Magnus Morén</SurName>
-    <EmailAddress>magnus.moren@hh.se</EmailAddress>
+    <EmailAddress>mailto:magnus.moren@hh.se</EmailAddress>
     <TelephoneNumber>+46 35 167383</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Halmstad University</Company>
     <SurName>Magnus Morén</SurName>
-    <EmailAddress>magnus.moren@hh.se</EmailAddress>
+    <EmailAddress>mailto:magnus.moren@hh.se</EmailAddress>
     <TelephoneNumber>+46 35 167383</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Halmstad University</Company>
     <SurName>Helpdesk Högskloan i Halmstad</SurName>
-    <EmailAddress>helpdesk@hh.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@hh.se</EmailAddress>
     <TelephoneNumber>+35 167800</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml b/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
index c64ecf72..439714d0 100644
--- a/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
@@ -96,19 +96,19 @@ URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
   <ContactPerson contactType="administrative">
     <Company>Sophiahemmet University</Company>
     <SurName>Sophiahemmet IT</SurName>
-    <EmailAddress>itsupport@sophiahemmet.se</EmailAddress>
+    <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
     <TelephoneNumber>+46 8 406 2525</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Sophiahemmet University</Company>
     <SurName>Sophiahemmet IT</SurName>
-    <EmailAddress>itsupport@sophiahemmet.se</EmailAddress>
+    <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
     <TelephoneNumber>+46 8 406 2525</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Sophiahemmet University</Company>
     <SurName>Sophiahemmet IT</SurName>
-    <EmailAddress>itsupport@sophiahemmet.se</EmailAddress>
+    <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
     <TelephoneNumber>+46 8 406 2525</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
index 9aae47fb..82e50b11 100644
--- a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
+++ b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
@@ -102,19 +102,19 @@ I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
   <ContactPerson contactType="administrative">
     <Company>Mid Sweden University</Company>
     <SurName>SystemDrift, IT-avdelningen, Mittuniversitetet</SurName>
-    <EmailAddress>SystemDriftIT@miun.se</EmailAddress>
+    <EmailAddress>mailto:SystemDriftIT@miun.se</EmailAddress>
     <TelephoneNumber>+46 771 975 000</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Mid Sweden University</Company>
     <SurName>Ove Olander</SurName>
-    <EmailAddress>Ove.Olander@miun.se</EmailAddress>
+    <EmailAddress>mailto:Ove.Olander@miun.se</EmailAddress>
     <TelephoneNumber>+46 63 165787</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Mid Sweden University</Company>
     <SurName>IT Helpdesk</SurName>
-    <EmailAddress>helpdesk@miun.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@miun.se</EmailAddress>
     <TelephoneNumber>+46 771 976130</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
index fc121247..2a4c4ff8 100644
--- a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
@@ -122,17 +122,17 @@ MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ==
   <ContactPerson contactType="administrative">
     <Company>Uppsala University</Company>
     <SurName>SAML2 admins</SurName>
-    <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
+    <EmailAddress>mailto:akka-datordrift@its.uu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Uppsala University</Company>
     <SurName>SAML2 admins</SurName>
-    <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
+    <EmailAddress>mailto:akka-datordrift@its.uu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Uppsala universitet</Company>
     <SurName>IT Servicedesk</SurName>
-    <EmailAddress>helpdesk@uu.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@uu.se</EmailAddress>
     <TelephoneNumber>+46 18 4714400</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
index a8227b31..aa524dbc 100644
--- a/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
+++ b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
@@ -111,7 +111,7 @@
   <ContactPerson contactType="support">
     <GivenName>Lars</GivenName>
     <SurName>Lind</SurName>
-    <EmailAddress>itsupport@uniarts.se</EmailAddress>
+    <EmailAddress>mailto:itsupport@uniarts.se</EmailAddress>
     <TelephoneNumber>+46(0)849400220</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>