Fixed missing mailto: in Contact info

309 files changed, 626 insertions, 626 deletions

diff --git a/swamid-2.0/1827881.mediaspace.kaltura.com.xml b/swamid-2.0/1827881.mediaspace.kaltura.com.xml
index 937be42f..77ac2886 100644
--- a/swamid-2.0/1827881.mediaspace.kaltura.com.xml
+++ b/swamid-2.0/1827881.mediaspace.kaltura.com.xml
@@ -33,6 +33,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/38caledon.ddns.net-shibboleth.xml b/swamid-2.0/38caledon.ddns.net-shibboleth.xml
index 66737bde..f60a2e95 100644
--- a/swamid-2.0/38caledon.ddns.net-shibboleth.xml
+++ b/swamid-2.0/38caledon.ddns.net-shibboleth.xml
@@ -46,11 +46,11 @@ SP</md:OrganizationDisplayName>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Alan</md:GivenName>
     <md:SurName>Buxey</md:SurName>
-    <md:EmailAddress>alan.buxey@myunidays.com</md:EmailAddress>
+    <md:EmailAddress>mailto:alan.buxey@myunidays.com</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>Alan</md:GivenName>
     <md:SurName>Buxey</md:SurName>
-    <md:EmailAddress>alan.buxey@myunidays.com</md:EmailAddress>
+    <md:EmailAddress>mailto:alan.buxey@myunidays.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/7t.lbic.lu.se.xml b/swamid-2.0/7t.lbic.lu.se.xml
index 625b60a6..15419686 100644
--- a/swamid-2.0/7t.lbic.lu.se.xml
+++ b/swamid-2.0/7t.lbic.lu.se.xml
@@ -40,6 +40,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Anders</md:GivenName>
     <md:SurName>Mårtensson</md:SurName>
-    <md:EmailAddress>Anders.Martensson@med.lu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:Anders.Martensson@med.lu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/account-utv.hh.se-shibboleth.xml b/swamid-2.0/account-utv.hh.se-shibboleth.xml
index 134cd644..992bd945 100644
--- a/swamid-2.0/account-utv.hh.se-shibboleth.xml
+++ b/swamid-2.0/account-utv.hh.se-shibboleth.xml
@@ -102,6 +102,6 @@ SkvUGlQ34ywYDYG3PMSs2Bks6PnClNWyuRjz0pPAThDxeEAJfYPkB+3EGFuHd9bb
     <md:Company>Högskolan i Halmstad</md:Company>
     <md:GivenName>Björn</md:GivenName>
     <md:SurName>Gabrielsson</md:SurName>
-    <md:EmailAddress>bjorn.gabrielsson@hh.se</md:EmailAddress>
+    <md:EmailAddress>mailto:bjorn.gabrielsson@hh.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/account.liu.se-shibboleth-sp.xml b/swamid-2.0/account.liu.se-shibboleth-sp.xml
index f07836f7..56e81b35 100644
--- a/swamid-2.0/account.liu.se-shibboleth-sp.xml
+++ b/swamid-2.0/account.liu.se-shibboleth-sp.xml
@@ -87,14 +87,14 @@ CP6HXDWqslCprTd/jZgMGAOpLsCTNIOwicpOR/R2OuV2ZEol6aSJAFw/fIqsPCLJ
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:SurName>LiU-IT SAML admins</md:SurName>
-    <md:EmailAddress>saml-admins@it.liu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:SurName>LiU-IT Helpdesk</md:SurName>
-    <md:EmailAddress>helpdesk@liu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:helpdesk@liu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:SurName>LiU-IT SAML admins</md:SurName>
-    <md:EmailAddress>saml-admins@it.liu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml b/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
index bbeac6b1..ab4c7ec0 100644
--- a/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
+++ b/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
@@ -64,6 +64,6 @@ iJJZ3BjPM7Q/BJ92X8XQT/47DwhoNQCqHpQzOKiH
   <ns0:ContactPerson contactType="technical">
     <ns0:Company>eduID</ns0:Company>
     <ns0:GivenName>Sysadmin</ns0:GivenName>
-    <ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
+    <ns0:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
   </ns0:ContactPerson>
 </ns0:EntityDescriptor>
diff --git a/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml b/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml
index 5a37fc30..1539cc0e 100644
--- a/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml
@@ -61,7 +61,7 @@ xxDg6j9aNkDMliUUAe6tc0OcQkp0gbwwFzJMT/qq8K7AfKlX8vES9Q==
   <md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
     <md:SurName>IT Servicedesk</md:SurName>
-    <md:EmailAddress>helpdesk@uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:helpdesk@uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/akka-adm.uu.se-shibboleth.xml b/swamid-2.0/akka-adm.uu.se-shibboleth.xml
index 72c69d08..938d4dd2 100644
--- a/swamid-2.0/akka-adm.uu.se-shibboleth.xml
+++ b/swamid-2.0/akka-adm.uu.se-shibboleth.xml
@@ -64,7 +64,7 @@
   <md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
     <md:SurName>IT Servicedesk</md:SurName>
-    <md:EmailAddress>helpdesk@uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:helpdesk@uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 444be912..78fb5bb8 100644
--- a/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -37,6 +37,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>SUNET</md:GivenName>
     <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@sunet.se</md:EmailAddress>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml b/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml
index 598d53ed..fabf8b9a 100644
--- a/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml
+++ b/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml
@@ -91,10 +91,10 @@ HGYrlNKYma5Wmcg0BqTiZPbh4Z8VWJBWGHIGND3F23ElplSxM+j63k4=
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Technical</md:GivenName>
-    <md:EmailAddress>noc@sunet.se</md:EmailAddress>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>noc@sunet.se</md:EmailAddress>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/auth.fieldsites.se-saml-cpauth.xml b/swamid-2.0/auth.fieldsites.se-saml-cpauth.xml
index 899e36e4..ea7e8ce1 100644
--- a/swamid-2.0/auth.fieldsites.se-saml-cpauth.xml
+++ b/swamid-2.0/auth.fieldsites.se-saml-cpauth.xml
@@ -92,6 +92,6 @@ ut7vQ9gFxIHIfE526gVIlHUomwr6JGU=
   <md:ContactPerson contactType="technical">
     <md:GivenName>Oleg</md:GivenName>
     <md:SurName>Mirzov</md:SurName>
-    <md:EmailAddress>oleg.mirzov@nateko.lu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:oleg.mirzov@nateko.lu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/beta.augustus.se.xml b/swamid-2.0/beta.augustus.se.xml
index 3c212f97..ca9751fa 100644
--- a/swamid-2.0/beta.augustus.se.xml
+++ b/swamid-2.0/beta.augustus.se.xml
@@ -19,6 +19,6 @@
     <Company>Know Net AB</Company>
     <GivenName>Ingemar</GivenName>
     <SurName>Lundström</SurName>
-    <EmailAddress>ingemar.lundstrom@knownet.se</EmailAddress>
+    <EmailAddress>mailto:ingemar.lundstrom@knownet.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/betafoo.nordu.net-saml2-metadata.xml b/swamid-2.0/betafoo.nordu.net-saml2-metadata.xml
index c44cf9ed..01020c4d 100644
--- a/swamid-2.0/betafoo.nordu.net-saml2-metadata.xml
+++ b/swamid-2.0/betafoo.nordu.net-saml2-metadata.xml
@@ -36,6 +36,6 @@ FqI3Il3tF2U+FgOT+nizupQelaoagRNerw3p2FHEYeBaTCYiW3IF7lUMIjoX2MYI
     <md:Company>NORDUnet A/S</md:Company>
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Lundberg</md:SurName>
-    <md:EmailAddress>lundberg@nordu.net</md:EmailAddress>
+    <md:EmailAddress>mailto:lundberg@nordu.net</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
index 724a57a8..4a5df4b9 100644
--- a/swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
@@ -22,6 +22,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/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 39b5b74a..29967436 100644
--- a/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -42,6 +42,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>SUNET</md:GivenName>
     <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@sunet.se</md:EmailAddress>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml
index 87a129b7..57211c8c 100644
--- a/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml
@@ -22,6 +22,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>SUNET</md:GivenName>
     <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@sunet.se</md:EmailAddress>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/box.net.xml b/swamid-2.0/box.net.xml
index 40394cd2..9db9b29f 100644
--- a/swamid-2.0/box.net.xml
+++ b/swamid-2.0/box.net.xml
@@ -35,6 +35,6 @@
     <md:Company>Box.net</md:Company>
     <md:GivenName>Box</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>business-support@box.com</md:EmailAddress>
+    <md:EmailAddress>mailto:business-support@box.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/brandkeeper.se-wsfed.xml b/swamid-2.0/brandkeeper.se-wsfed.xml
index 55307eb7..d054d3dd 100644
--- a/swamid-2.0/brandkeeper.se-wsfed.xml
+++ b/swamid-2.0/brandkeeper.se-wsfed.xml
@@ -32,7 +32,7 @@
     <OrganizationURL xml:lang="en">http://www.brandkeeper.se/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-    <EmailAddress>support@brandkeeper.se</EmailAddress>
+    <EmailAddress>mailto:support@brandkeeper.se</EmailAddress>
     <TelephoneNumber>+46 470 771 440</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml b/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
index d838c1a4..2f8f7e50 100644
--- a/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
+++ b/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
@@ -41,6 +41,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Morten</md:GivenName>
     <md:SurName>Petersen</md:SurName>
-    <md:EmailAddress>morten@graduateland.com</md:EmailAddress>
+    <md:EmailAddress>mailto:morten@graduateland.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml b/swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml
index 88331db5..fc73b985 100644
--- a/swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml
+++ b/swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml
@@ -51,12 +51,12 @@ wXXiBDXS3PNHXQnnpys=
     <md:Company>NORDUnet</md:Company>
     <md:GivenName>Leif</md:GivenName>
     <md:SurName>Johansson</md:SurName>
-    <md:EmailAddress>leifj@nordu.net</md:EmailAddress>
+    <md:EmailAddress>mailto:leifj@nordu.net</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>NORDUnet</md:Company>
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Berggren</md:SurName>
-    <md:EmailAddress>jbn@nordu.net</md:EmailAddress>
+    <md:EmailAddress>mailto:jbn@nordu.net</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/connect-stable.sunet.se-shibboleth.xml b/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
index 476f4b44..56bca934 100644
--- a/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
@@ -101,6 +101,6 @@ SgXS3Q4K3pF+qwGrb3INKQ==
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>NORDUnet NOC</md:Company>
-    <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/crowd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml b/swamid-2.0/crowd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
index 8f9cb456..b2de0752 100644
--- a/swamid-2.0/crowd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
+++ b/swamid-2.0/crowd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
@@ -66,6 +66,6 @@ KKh9ztE=
     <Company>Uppsala University Library</Company>
     <GivenName>Rasmus</GivenName>
     <SurName>Skagersten</SurName>
-    <EmailAddress>helpdesk@ub.uu.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@ub.uu.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/cwd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml b/swamid-2.0/cwd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
index 6d87d35c..a03b7a37 100644
--- a/swamid-2.0/cwd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
+++ b/swamid-2.0/cwd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
@@ -68,6 +68,6 @@ SULb2eGULK5t37tA/bB0/ziN+psCe+MfZQEEZTf+6cE=
     <md:Company>Uppsala University Library</md:Company>
     <md:GivenName>Rasmus</md:GivenName>
     <md:SurName>Skagersten</md:SurName>
-    <md:EmailAddress>helpdesk@ub.uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:helpdesk@ub.uu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/dedserv79.levonline.com-shibboleth.xml b/swamid-2.0/dedserv79.levonline.com-shibboleth.xml
index da8d9023..eb71b4c4 100644
--- a/swamid-2.0/dedserv79.levonline.com-shibboleth.xml
+++ b/swamid-2.0/dedserv79.levonline.com-shibboleth.xml
@@ -38,6 +38,6 @@ qlG83cbyWydqYCCYruAVslAykrwfBXAXdCs4YBs=</ds:X509Certificate>
     <Company>Emanuel AB</Company>
     <GivenName>Fredrik</GivenName>
     <SurName>Näslund</SurName>
-    <EmailAddress>fredrik.naslund@emanuel.se</EmailAddress>
+    <EmailAddress>mailto:fredrik.naslund@emanuel.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml
index a456373e..b92f0e3a 100644
--- a/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml
@@ -111,17 +111,17 @@ czuyQatrgEL0HlWr
   <md:ContactPerson contactType="administrative">
     <md:Company>Uppsala University</md:Company>
     <md:SurName>Team Plattform</md:SurName>
-    <md:EmailAddress>uadm-team_plattform@lists.uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:uadm-team_plattform@lists.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>Uppsala University</md:Company>
     <md:SurName>John Morrison</md:SurName>
-    <md:EmailAddress>john.morrison@uadm.uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:john.morrison@uadm.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
     <md:SurName>IT Servicedesk</md:SurName>
-    <md:EmailAddress>helpdesk@uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:helpdesk@uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/dev.play.smdb.kb.se.xml b/swamid-2.0/dev.play.smdb.kb.se.xml
index 170a2c1d..b3318de7 100644
--- a/swamid-2.0/dev.play.smdb.kb.se.xml
+++ b/swamid-2.0/dev.play.smdb.kb.se.xml
@@ -42,6 +42,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/dev.play.sunet.se.xml b/swamid-2.0/dev.play.sunet.se.xml
index 2c3651ed..b8e866b4 100644
--- a/swamid-2.0/dev.play.sunet.se.xml
+++ b/swamid-2.0/dev.play.sunet.se.xml
@@ -34,6 +34,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
index c21b4255..98eaf5e4 100644
--- a/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -40,6 +40,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Pablo</md:GivenName>
     <md:SurName>Millet</md:SurName>
-    <md:EmailAddress>pablo.millet@gu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:pablo.millet@gu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml b/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
index d0ebb9fa..8b6942e6 100644
--- a/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
+++ b/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
@@ -37,10 +37,10 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Fredrik Lysen</md:GivenName>
-    <md:EmailAddress>fredrik.lysen@ub.uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.lysen@ub.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>Helpdesk</md:GivenName>
-    <md:EmailAddress>helpdesk@ub.uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:helpdesk@ub.uu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml b/swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml
index 102a4746..16ea4444 100644
--- a/swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml
+++ b/swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml
@@ -93,6 +93,6 @@ nM/QX+BEspFf3+z68UOv6Boy1MYLCivGrb7XBYKIipEY0TmR
   <md:ContactPerson contactType="technical">
     <md:GivenName>Mattias</md:GivenName>
     <md:SurName>Borell</md:SurName>
-    <md:EmailAddress>mattias.borell@med.lu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:mattias.borell@med.lu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/du.hr.evry.se-shibboleth.xml b/swamid-2.0/du.hr.evry.se-shibboleth.xml
index 2bb620a3..88cf5130 100644
--- a/swamid-2.0/du.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/du.hr.evry.se-shibboleth.xml
@@ -81,6 +81,6 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml b/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml
index bdfa1d42..bb33929d 100644
--- a/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml
+++ b/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml
@@ -38,6 +38,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Mikael</md:GivenName>
     <md:SurName>Westoo</md:SurName>
-    <md:EmailAddress>mikael.westoo@e-identitet.se</md:EmailAddress>
+    <md:EmailAddress>mailto:mikael.westoo@e-identitet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ensky.lhs.se-shibboleth.xml b/swamid-2.0/ensky.lhs.se-shibboleth.xml
index 5013ff4b..007ad2c9 100644
--- a/swamid-2.0/ensky.lhs.se-shibboleth.xml
+++ b/swamid-2.0/ensky.lhs.se-shibboleth.xml
@@ -18,6 +18,6 @@
   <ContactPerson contactType="technical">
     <Company>Stockholm university</Company>
     <SurName>Helpdesk</SurName>
-    <EmailAddress>helpdesk@it.su.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@it.su.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
index c6c643f9..092acc4e 100644
--- a/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
@@ -34,14 +34,14 @@
   </Organization>
   <ContactPerson contactType="technical">
     <Company>Chalmers</Company>
-    <EmailAddress>appro@chalmers.se</EmailAddress>
+    <EmailAddress>mailto:appro@chalmers.se</EmailAddress>
   </ContactPerson>
   <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/fs.test.ad.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml
index 94123997..2f1286e3 100644
--- a/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml
@@ -84,7 +84,7 @@
   <ContactPerson contactType="support">
     <GivenName>Saml</GivenName>
     <SurName>Admins</SurName>
-    <EmailAddress>saml-admins@it.liu.se</EmailAddress>
+    <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
     <TelephoneNumber>+46 13 282828</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml b/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
index bfde5319..68eb9526 100644
--- a/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
+++ b/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
@@ -30,6 +30,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Robin</md:GivenName>
     <md:SurName>Jensen</md:SurName>
-    <md:EmailAddress>robin@montania.se</md:EmailAddress>
+    <md:EmailAddress>mailto:robin@montania.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml b/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml
index caff4d11..10742b9f 100644
--- a/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml
+++ b/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml
@@ -90,6 +90,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Peter</md:GivenName>
     <md:SurName>Moller</md:SurName>
-    <md:EmailAddress>peter.moller@cs.lth.se</md:EmailAddress>
+    <md:EmailAddress>mailto:peter.moller@cs.lth.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml b/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
index 899fbfd5..b1c0ba0b 100644
--- a/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
+++ b/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
@@ -32,6 +32,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Morten</md:GivenName>
     <md:SurName>Petersen</md:SurName>
-    <md:EmailAddress>morten@graduateland.com</md:EmailAddress>
+    <md:EmailAddress>mailto:morten@graduateland.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/his.hr.evry.se-shibboleth.xml b/swamid-2.0/his.hr.evry.se-shibboleth.xml
index b1f22fb2..c5a69374 100644
--- a/swamid-2.0/his.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/his.hr.evry.se-shibboleth.xml
@@ -74,6 +74,6 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/hkr.hr.evry.se-shibboleth.xml b/swamid-2.0/hkr.hr.evry.se-shibboleth.xml
index 3c1d585a..f07bbfe2 100644
--- a/swamid-2.0/hkr.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/hkr.hr.evry.se-shibboleth.xml
@@ -74,6 +74,6 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/id.statenssc.se-adfs-services-trust.xml b/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
index 946de59c..50b8fba1 100644
--- a/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
+++ b/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
@@ -72,17 +72,17 @@
   <ContactPerson contactType="support">
     <GivenName>Johan</GivenName>
     <SurName>Göthberg</SurName>
-    <EmailAddress>johan.gothberg@statenssc.se</EmailAddress>
+    <EmailAddress>mailto:johan.gothberg@statenssc.se</EmailAddress>
     <TelephoneNumber>0771456000</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="administrative">
     <SurName>Johan Larsson</SurName>
-    <EmailAddress>johan.larsson@statenssc.se</EmailAddress>
+    <EmailAddress>mailto:johan.larsson@statenssc.se</EmailAddress>
     <TelephoneNumber>+46 10-456 03 10</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <SurName>Lars Forsgren</SurName>
-    <EmailAddress>lars.forsgren@tieto.com</EmailAddress>
+    <EmailAddress>mailto:lars.forsgren@tieto.com</EmailAddress>
     <TelephoneNumber>+46 10-481 01 97</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
index 715d0f3f..f22cebbc 100644
--- a/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
+++ b/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
@@ -92,6 +92,6 @@ X627IsSkKg==
   </Organization>
   <ContactPerson contactType="technical">
     <Company>NORDUnet NOC</Company>
-    <EmailAddress>noc@nordu.net</EmailAddress>
+    <EmailAddress>mailto:noc@nordu.net</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 327f7250..9a9da4e8 100644
--- a/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -34,6 +34,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>SUNET</md:GivenName>
     <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@sunet.se</md:EmailAddress>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml
index 12ae465e..8b83b3fd 100644
--- a/swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml
@@ -22,6 +22,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>SUNET</md:GivenName>
     <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@sunet.se</md:EmailAddress>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml b/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml
index 6449707a..b28b8293 100644
--- a/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml
@@ -68,6 +68,6 @@
   <ContactPerson contactType="support">
     <GivenName>Tomas</GivenName>
     <SurName>Legat</SurName>
-    <EmailAddress>tomas.legat@sh.se</EmailAddress>
+    <EmailAddress>mailto:tomas.legat@sh.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
index 15ff70e3..1f4439d7 100644
--- a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
+++ b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
@@ -87,10 +87,10 @@ hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+
   <ns0:ContactPerson contactType="technical">
     <ns0:GivenName>eduID</ns0:GivenName>
     <ns0:SurName>developers</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:GivenName>Support</ns0:GivenName>
-    <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/idp.test.antagning.se-aws-idp.xml b/swamid-2.0/idp.test.antagning.se-aws-idp.xml
index 318acd16..f1d98a25 100644
--- a/swamid-2.0/idp.test.antagning.se-aws-idp.xml
+++ b/swamid-2.0/idp.test.antagning.se-aws-idp.xml
@@ -57,19 +57,19 @@ MIIDEzCCAfugAwIBAgIJAISr5vVr4OFKMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMMFWlkcC50ZXN0
   <ContactPerson contactType="administrative">
     <Company>Universityadmissions.se</Company>
     <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
+    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
     <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Universityadmissions.se</Company>
     <SurName>Håkan Pettersson</SurName>
-    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
+    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
     <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Universityadmissions.se</Company>
     <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
+    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
     <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml b/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml
index 5a84047c..22b8d10d 100644
--- a/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml
@@ -84,11 +84,11 @@ YDkKy11d6W9v8pPknySJoAC5hL1v26ov7NpY6LN+tNAhuSfMSKo1ugFmOfX/CAIc
   </Organization>
   <ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <GivenName>SAML Admins</GivenName>
-    <EmailAddress>saml-admins@slu.se</EmailAddress>
+    <EmailAddress>mailto:saml-admins@slu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <GivenName>SAML Admins</GivenName>
-    <EmailAddress>saml-admins@slu.se</EmailAddress>
+    <EmailAddress>mailto:saml-admins@slu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <GivenName>Help Desk</GivenName>
diff --git a/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml b/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml
index 8b9eebef..a2ff8423 100644
--- a/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml
@@ -40,6 +40,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Datordrift</md:SurName>
-    <md:EmailAddress>datordrift@umdac.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:datordrift@umdac.umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml
index 438c61a3..9d359e55 100644
--- a/swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml
@@ -22,6 +22,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Mats</md:GivenName>
     <md:SurName>Luspa</md:SurName>
-    <md:EmailAddress>matsl@irf.se</md:EmailAddress>
+    <md:EmailAddress>mailto:matsl@irf.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
index a99859be..1a6415dc 100644
--- a/swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
@@ -29,6 +29,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Bas</md:GivenName>
     <md:SurName>Zoetekouw</md:SurName>
-    <md:EmailAddress>bas.zoetekouw@surfnet.nl</md:EmailAddress>
+    <md:EmailAddress>mailto:bas.zoetekouw@surfnet.nl</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/internt.geol.lu.se-shibboleth.xml b/swamid-2.0/internt.geol.lu.se-shibboleth.xml
index 42702191..f4c14a3c 100644
--- a/swamid-2.0/internt.geol.lu.se-shibboleth.xml
+++ b/swamid-2.0/internt.geol.lu.se-shibboleth.xml
@@ -82,6 +82,6 @@ pyBfqZRW+lFWZ6b06Bj4Mg==
   <md:ContactPerson contactType="technical">
     <md:GivenName>Gert</md:GivenName>
     <md:SurName>Pettersson</md:SurName>
-    <md:EmailAddress>gert.pettersson@geol.lu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:gert.pettersson@geol.lu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml b/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml
index 1a65075f..f723afe3 100644
--- a/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml
+++ b/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml
@@ -90,7 +90,7 @@ R8goZylfLlaYH0RQyMuClSC5BJlBB7yL58kraKY=
   <md:ContactPerson contactType="technical">
     <md:GivenName>Erik</md:GivenName>
     <md:SurName>Jonsson</md:SurName>
-    <md:EmailAddress>erik.jonsson@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:erik.jonsson@umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907869295</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/kau.hr.evry.se-shibboleth.xml b/swamid-2.0/kau.hr.evry.se-shibboleth.xml
index f1c83be3..cae23385 100644
--- a/swamid-2.0/kau.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/kau.hr.evry.se-shibboleth.xml
@@ -74,6 +74,6 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
index 5ea970c6..8efa478b 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ w5aKug==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml b/swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml
index f5464b93..25969e71 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml
@@ -195,16 +195,16 @@ QfQy1lyrNjxrtHbS9ZGNpgVlaNvNHWF4ENGIAuxBLO2IZ6TgLGdNtB0Cn3c+Xdti
   <ContactPerson contactType="administrative">
     <Company>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
index d406ef79..61deda6f 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ Xtg7VBxaqt1Fm/Me7/+LxiQ=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
index 1242cba0..c271c29e 100644
--- a/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ p012eg==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
index 8d350d87..8e0fa628 100644
--- a/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ Fgjs4zg7hkT8XjhWJeHVZjI=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml
index 15018ee0..71172a6a 100644
--- a/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ BeVqTg==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-02.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-02.ladok.umu.se-student-sp.xml
index 933bd226..78708b0c 100644
--- a/swamid-2.0/ladok3-02.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-02.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ V2U1emX7Cc8OvH12y7nKZu0=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml
index a45c7c24..2f491697 100644
--- a/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ OqxKbw==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-03.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-03.ladok.umu.se-student-sp.xml
index 78ddae65..8f130dd2 100644
--- a/swamid-2.0/ladok3-03.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-03.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ IlstWICQczAoX1y5Ow2IOEo=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml
index c8f83c3e..8e435ecc 100644
--- a/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ AMLCoA==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-04.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-04.ladok.umu.se-student-sp.xml
index abe46faa..fc46bc16 100644
--- a/swamid-2.0/ladok3-04.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-04.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ Nl/wC4jydXm9h5ZdZLZm55Q=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml
index a33bb5ce..2bdb5376 100644
--- a/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ Ij/QYw==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-05.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-05.ladok.umu.se-student-sp.xml
index 8f9af1a0..9b9fe6b4 100644
--- a/swamid-2.0/ladok3-05.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-05.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ C6PyjKalJKJ5+Dozdnw9O8O8AahzAOfS6rgV2cN5cJek56UEEufuFFpYhsI+2R98
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml
index aaf4ce3d..5d944775 100644
--- a/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ z181Cw==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-06.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-06.ladok.umu.se-student-sp.xml
index 3eedabca..18592493 100644
--- a/swamid-2.0/ladok3-06.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-06.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ cdzlS3RlY2kbVOG+uqzEMa7wLa7tSZVRK+FkhGvg0GxVS0KH1KK15UTa71fydOLZ
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml
index be41a71a..8dcdddcf 100644
--- a/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ LB5BtA==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-07.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-07.ladok.umu.se-student-sp.xml
index 8d9e3baa..4c7b1b46 100644
--- a/swamid-2.0/ladok3-07.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-07.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ Tf+bD9kP9t0LVFwEIee45FY=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml
index 55c47a2c..cd9cef98 100644
--- a/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ MTpiVw==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-08.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-08.ladok.umu.se-student-sp.xml
index 6b9aa2a4..c2d39d01 100644
--- a/swamid-2.0/ladok3-08.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-08.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ VmqhSIq31DIL5TJwnV8k1SJ95uWyflne1xoqht0IcL3QONAggkL14fVXx+nUSDVQ
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml
index e4a5087d..e4b3bba2 100644
--- a/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ QwOzJA==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-09.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-09.ladok.umu.se-student-sp.xml
index d0b39992..cf33791b 100644
--- a/swamid-2.0/ladok3-09.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-09.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ RRQKVctmQVOlffVIDFzZgbA=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml
index f937bd2f..33af16a9 100644
--- a/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ zL2y+w==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-10.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-10.ladok.umu.se-student-sp.xml
index bcaafc6e..08ba6397 100644
--- a/swamid-2.0/ladok3-10.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-10.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ ZZUz8BdNuajMBgDmW3z2BHnhALPtNBIxNF+8fhUEfFUfjGRvd20Kj5BybjyX+HP1
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-11.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-11.ladok.umu.se-gui-sp.xml
index 4a042a5f..aedd3b80 100644
--- a/swamid-2.0/ladok3-11.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-11.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ upo=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-11.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-11.ladok.umu.se-student-sp.xml
index 84c56d70..14bbbad7 100644
--- a/swamid-2.0/ladok3-11.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-11.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ dabCeN+PQJ8+6s9gO04gD/Q=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-12.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-12.ladok.umu.se-gui-sp.xml
index 4aa733aa..f1afab7c 100644
--- a/swamid-2.0/ladok3-12.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-12.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ sSWjeK+ZudD5JSHb+STFDRSWC7oyQNiQuddlj0hF5L7GnePnetK4TIQbcEHgNb9M
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-12.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-12.ladok.umu.se-student-sp.xml
index 519ae99d..ed950544 100644
--- a/swamid-2.0/ladok3-12.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-12.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ n1fPE1wPBVcs1yMWkY5e3NM=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-13.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-13.ladok.umu.se-gui-sp.xml
index 78419a2f..b9d55765 100644
--- a/swamid-2.0/ladok3-13.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-13.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ aC9LXg==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-13.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-13.ladok.umu.se-student-sp.xml
index d97ab5f5..34289c22 100644
--- a/swamid-2.0/ladok3-13.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-13.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ zbxHPKCXMByJo3rJ0WuyUqY=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-14.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-14.ladok.umu.se-gui-sp.xml
index b8401f1c..66e16183 100644
--- a/swamid-2.0/ladok3-14.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-14.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ o+yvpw==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-14.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-14.ladok.umu.se-student-sp.xml
index 230c31f1..941a1ac7 100644
--- a/swamid-2.0/ladok3-14.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-14.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ fad56LiMqe2XQBdVmuC0G6vTwrUGifrgKl1ijK1OxgYk709aHsu8Chtr2iGENcv1
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-15.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-15.ladok.umu.se-gui-sp.xml
index 794ab5bf..3d426182 100644
--- a/swamid-2.0/ladok3-15.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-15.ladok.umu.se-gui-sp.xml
@@ -82,16 +82,16 @@ JvDZsW/4WG/6yjj9c/zSH/9Bs/6tQ5cIARH9IU+mQkB3UDdZ9NLqGRU77aHeBsDx
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-15.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-15.ladok.umu.se-student-sp.xml
index 37dd79e4..2a1484a6 100644
--- a/swamid-2.0/ladok3-15.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-15.ladok.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ LJSXMPAlv7ZobrHxIKcFL/UyNeYeEMXsxjSAaAa/Vf38guEPofm7AnxZBMdkF8tJ
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-16.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-16.ladok.umu.se-gui-sp.xml
index 2443407d..4c630977 100644
--- a/swamid-2.0/ladok3-16.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-16.ladok.umu.se-gui-sp.xml
@@ -91,16 +91,16 @@ LVruwg==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-16.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-16.ladok.umu.se-student-sp.xml
index 5f4443f8..e766ea53 100644
--- a/swamid-2.0/ladok3-16.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-16.ladok.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ rsL6vrA6L4FaveTRIMW93QQjcXLDr7IDLdT14XT2kq9pFvGSxxXYtklgqalIFAcN
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-17.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-17.ladok.umu.se-gui-sp.xml
index 3c33301c..b270a0e3 100644
--- a/swamid-2.0/ladok3-17.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-17.ladok.umu.se-gui-sp.xml
@@ -82,16 +82,16 @@ XUiL1Q==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-18.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-18.ladok.umu.se-gui-sp.xml
index e774f68d..43b364e4 100644
--- a/swamid-2.0/ladok3-18.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-18.ladok.umu.se-gui-sp.xml
@@ -82,16 +82,16 @@ HS7qIw==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-19.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-19.ladok.umu.se-gui-sp.xml
index 2e98259c..c3b7f92c 100644
--- a/swamid-2.0/ladok3-19.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-19.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ IJHO3g==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-19.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-19.ladok.umu.se-student-sp.xml
index 0dc5931b..2c1e0ab3 100644
--- a/swamid-2.0/ladok3-19.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-19.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ NAiBKYQ60AYd/AS/yPrpk2llTUHfd6tdvC4SqKuiEYsy2pYvfN//PPFrdI9mr+Ir
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-20.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-20.ladok.umu.se-gui-sp.xml
index 090b1529..2c7e50b6 100644
--- a/swamid-2.0/ladok3-20.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-20.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ zxjcig==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-20.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-20.ladok.umu.se-student-sp.xml
index bea61623..7d2045a1 100644
--- a/swamid-2.0/ladok3-20.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-20.ladok.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ prCutGsiape3JHL2BV4baLs=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-21.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-21.ladok.umu.se-gui-sp.xml
index 5bd413c8..151c5206 100644
--- a/swamid-2.0/ladok3-21.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-21.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ cobHWw==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-21.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-21.ladok.umu.se-student-sp.xml
index 2d815315..ae8e7129 100644
--- a/swamid-2.0/ladok3-21.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-21.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ LSXPvEPTHzAkNoiAXAn5jW9xE3fsWdJs40SdhR1tcZ4LaaaGRvFCk6j+QIXLdjuE
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-22.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-22.ladok.umu.se-gui-sp.xml
index 60c89ee8..a701905c 100644
--- a/swamid-2.0/ladok3-22.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-22.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ y3bsRv7NPODV1vABsrLjXqfNUmWti1gFX+Nnagaw5u1xMLcjhBme/7fqGwrI3Sct
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-22.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-22.ladok.umu.se-student-sp.xml
index 3ba310f5..c4e56fec 100644
--- a/swamid-2.0/ladok3-22.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-22.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ udv5m2jOU/2r0ZbADQVJzjI=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-23.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-23.ladok.umu.se-gui-sp.xml
index bad3979b..2d7e16b1 100644
--- a/swamid-2.0/ladok3-23.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-23.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ vH4mRA==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-23.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-23.ladok.umu.se-student-sp.xml
index 0eb1ca47..3a52760f 100644
--- a/swamid-2.0/ladok3-23.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-23.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ cA8Pb/ntxkRoZoGUw/oqpGrIpZMvGOFxehGdzOd+ZTpf9L0R37byGM94pTq6gz33
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-24.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-24.ladok.umu.se-gui-sp.xml
index 2cd29567..129e9616 100644
--- a/swamid-2.0/ladok3-24.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-24.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ AHgxyA==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-24.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-24.ladok.umu.se-student-sp.xml
index f4c70a6c..55a861d3 100644
--- a/swamid-2.0/ladok3-24.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-24.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ QU3oSUW5d9AK8EGOvHPJ30g=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-25.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-25.ladok.umu.se-gui-sp.xml
index 4b1190d0..4b952e7c 100644
--- a/swamid-2.0/ladok3-25.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-25.ladok.umu.se-gui-sp.xml
@@ -82,16 +82,16 @@ Iqy6Mg==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-25.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-25.ladok.umu.se-student-sp.xml
index 0bddf841..1e08458e 100644
--- a/swamid-2.0/ladok3-25.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-25.ladok.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ QtMsCZ6mBPfkyp3MQt4ZxGE=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-26.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-26.ladok.umu.se-gui-sp.xml
index fd1304dc..0be4e10d 100644
--- a/swamid-2.0/ladok3-26.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-26.ladok.umu.se-gui-sp.xml
@@ -82,16 +82,16 @@ nI2NEAestQcqgqbNRyj5JMCFhj1Q1yJT4oo2/HMVkscc9HJGcoes6UBvABxwfyd7
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-26.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-26.ladok.umu.se-student-sp.xml
index 0d703e73..77300705 100644
--- a/swamid-2.0/ladok3-26.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-26.ladok.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ S3wGxfaFGpWTdzfb1fzH40iPkSbw9vzr4R8MPfnoENsAN2C6Nqa+iAxjzyn+bMum
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-27.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-27.ladok.umu.se-gui-sp.xml
index 0d812bab..ff394c18 100644
--- a/swamid-2.0/ladok3-27.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-27.ladok.umu.se-gui-sp.xml
@@ -82,16 +82,16 @@ nU/m4Q==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-28.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-28.ladok.umu.se-gui-sp.xml
index a94a2a52..79b2f9fd 100644
--- a/swamid-2.0/ladok3-28.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-28.ladok.umu.se-gui-sp.xml
@@ -82,16 +82,16 @@ iKCuBw==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-28.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-28.ladok.umu.se-student-sp.xml
index dc09f0b4..f85cb132 100644
--- a/swamid-2.0/ladok3-28.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-28.ladok.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ fP1HmPeP4gs=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-29.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-29.ladok.umu.se-gui-sp.xml
index 8f190418..a1373b60 100644
--- a/swamid-2.0/ladok3-29.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-29.ladok.umu.se-gui-sp.xml
@@ -82,16 +82,16 @@ O7KVeg==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-29.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-29.ladok.umu.se-student-sp.xml
index a485ddd4..3b4a5e5b 100644
--- a/swamid-2.0/ladok3-29.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-29.ladok.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ tItXTrgKbqA=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-30.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-30.ladok.umu.se-gui-sp.xml
index d22809bd..68e5b9da 100644
--- a/swamid-2.0/ladok3-30.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-30.ladok.umu.se-gui-sp.xml
@@ -82,16 +82,16 @@ M71yRQ==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-30.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-30.ladok.umu.se-student-sp.xml
index 11fb0919..ad547615 100644
--- a/swamid-2.0/ladok3-30.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-30.ladok.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ L48gkLjk0N0=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-31.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-31.ladok.umu.se-gui-sp.xml
index 00c96ca1..bb9934a4 100644
--- a/swamid-2.0/ladok3-31.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-31.ladok.umu.se-gui-sp.xml
@@ -82,16 +82,16 @@ pdsPjw==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-31.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-31.ladok.umu.se-student-sp.xml
index 00ab623b..1ffc0f39 100644
--- a/swamid-2.0/ladok3-31.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-31.ladok.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ ARkFLPLbS6M=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-32.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-32.ladok.umu.se-gui-sp.xml
index 7af68cc7..0b1caac1 100644
--- a/swamid-2.0/ladok3-32.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-32.ladok.umu.se-gui-sp.xml
@@ -45,16 +45,16 @@ and do *NOT* provide it in real time to your partners.
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-33.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-33.ladok.umu.se-gui-sp.xml
index ada7eaa8..3056508f 100644
--- a/swamid-2.0/ladok3-33.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-33.ladok.umu.se-gui-sp.xml
@@ -45,16 +45,16 @@ and do *NOT* provide it in real time to your partners.
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-34.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-34.ladok.umu.se-gui-sp.xml
index 50b703d1..61a964fc 100644
--- a/swamid-2.0/ladok3-34.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-34.ladok.umu.se-gui-sp.xml
@@ -45,16 +45,16 @@ and do *NOT* provide it in real time to your partners.
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
index 2416eda8..54d302b6 100644
--- a/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ EeE68EA0OgCl1QP8GuR3llSLtvNsQS1JI2+LMPuma6sSEr1nQqwuZgZkQm78bygF
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml
index d3406533..7cd6317c 100644
--- a/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ xWDwb5aYklLO+9BLWcSBPuvhi/IL2zDSU2XY59ANCl168/3hv/V4
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
index f1e85c22..08393334 100644
--- a/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ UiWyXm1zkG9otie1FBOVIQeZ5GKf3qEgfphkTBcigBCHKMxrDFOEjr9WlZEX7UAw
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-01.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-01.its.umu.se-student-sp.xml
index 03f4e975..8db87ff7 100644
--- a/swamid-2.0/ladok3-demo-01.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-01.its.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ doapb4k+1TzJZ+MDX6jwvVMl0DN5+rmuHjkmu75L+UERnVJRSbIK
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
index f1731a44..c9ba3707 100644
--- a/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ a/lggwDHd7eCy/34Rs5nJw==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-02.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-02.its.umu.se-student-sp.xml
index fd9833e1..2885fea7 100644
--- a/swamid-2.0/ladok3-demo-02.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-02.its.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ sfAksU5zX5TLN6UmXQeW0u0pLpk4YCOXJJ5mX6E=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
index 7b4e9f81..b8e8bb8d 100644
--- a/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ b/vkajQh9nHWAfPhgIOgkQ==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-03.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-03.its.umu.se-student-sp.xml
index 229b2750..f1ac7d3c 100644
--- a/swamid-2.0/ladok3-demo-03.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-03.its.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ rTIw0vdVAMr/ssruViMKF91ztRL1ABMxhvn2OqUPW3kE7pJDw5+lDjH6NDeYcph1
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
index 20783657..27556dfa 100644
--- a/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ P6m+IbDWFLo61vhr/Nkcmw==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-04.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-04.its.umu.se-student-sp.xml
index b60a7e9a..1dc4e044 100644
--- a/swamid-2.0/ladok3-demo-04.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-04.its.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ zqfsY5dOVVVlGXOm2d6Tcg8HjBGWn6oo0ZUZGL1TI+XfHzGRnLgh
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
index 62532a51..dc639a0c 100644
--- a/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ ujZI0vVtQx+sTGMktkMb/w==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-05.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-05.its.umu.se-student-sp.xml
index 0a6ff552..2f2b1432 100644
--- a/swamid-2.0/ladok3-demo-05.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-05.its.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ XVpEXBWCzSEzde1b1UN1OpTum2X30RmEij8IrqvSnV9rX8RXu9zA
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-p00.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-p00.its.umu.se-gui-sp.xml
index 34c85ff9..ca00ae92 100644
--- a/swamid-2.0/ladok3-demo-p00.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-p00.its.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ RjGy4hnZ0d0E1vkLI2/F/uLaVuE=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-p00.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-p00.its.umu.se-student-sp.xml
index e439e463..31f07721 100644
--- a/swamid-2.0/ladok3-demo-p00.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-p00.its.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ amPC5F4um56p3wnuMyvTs3oRDfx4fOh/Kpt5LSK+UhYGHA==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-p01.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-p01.its.umu.se-gui-sp.xml
index 3bb9b5a5..5b7eccda 100644
--- a/swamid-2.0/ladok3-demo-p01.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-p01.its.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ d6zDyVH57UjisqGw7DbtNJ7fwDB6eO7QoIUmWfu7PnjOs4qzs1sSCkulJ7AYM7lG
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-p01.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-p01.its.umu.se-student-sp.xml
index 646f730a..5fd4e706 100644
--- a/swamid-2.0/ladok3-demo-p01.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-p01.its.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ xFmPKbYpiGoCWQ7zvdrC/dZEdncQ/lEafxHMtb2sbqwEBQ==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-p02.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-p02.its.umu.se-gui-sp.xml
index f3f272bb..060ee807 100644
--- a/swamid-2.0/ladok3-demo-p02.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-p02.its.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ jIEOnms9HH1cMiILW2hUwDoRlWn2yViby40MtNdAe4EIXMSKir5EFTdl9QTg0C81
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-p02.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-p02.its.umu.se-student-sp.xml
index 1d1fb50b..6ca265c4 100644
--- a/swamid-2.0/ladok3-demo-p02.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-p02.its.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ PgRf9awC3vDMvS6jY6AqIn9r2KPVqV4TWqBvYG0ARJrG+Q==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-jenkins.ladok.umu.se-securityrealm-finishlogin.xml b/swamid-2.0/ladok3-jenkins.ladok.umu.se-securityrealm-finishlogin.xml
index 44201b24..ed43933a 100644
--- a/swamid-2.0/ladok3-jenkins.ladok.umu.se-securityrealm-finishlogin.xml
+++ b/swamid-2.0/ladok3-jenkins.ladok.umu.se-securityrealm-finishlogin.xml
@@ -71,16 +71,16 @@ bYrcg39YS/2EWWrboSpMu2+agRG+NebnTpJzKirx/I1dZldnmvxN+j4ZhMoMZq+qZ4XK3kNY1q76
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml
index 37e24f49..829934c6 100644
--- a/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ vt1mkOs1sbw=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p00.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p00.ladok.umu.se-student-sp.xml
index d3edff94..98d95c78 100644
--- a/swamid-2.0/ladok3-p00.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p00.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ UEpDZ+oqJxcdV7QpvC9PesO5oSvH
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p01.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p01.ladok.umu.se-gui-sp.xml
index 694ab93f..00e0e552 100644
--- a/swamid-2.0/ladok3-p01.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p01.ladok.umu.se-gui-sp.xml
@@ -77,16 +77,16 @@ W3uPBzrXf9k=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p01.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p01.ladok.umu.se-student-sp.xml
index bc1c49b8..a9f03458 100644
--- a/swamid-2.0/ladok3-p01.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p01.ladok.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ P86mExCoIuyznb5vf/03ga9ht8Ve
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p02.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p02.ladok.umu.se-gui-sp.xml
index 42e547e5..92910fb2 100644
--- a/swamid-2.0/ladok3-p02.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p02.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ Al5BqP8qWS5p/VYAytgFhDBZuYxOviJGP5bLFh1unkvw2AK6nO+rLrdURyYtZ8Zm
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p02.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p02.ladok.umu.se-student-sp.xml
index 676d9206..ed8789b3 100644
--- a/swamid-2.0/ladok3-p02.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p02.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ LqzpOEkBR8tT0fyC2DJkREVCsGAxvcKabhTQJoROqVBlbP2uMdp8c/e8YDNv4KBD
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p03.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p03.ladok.umu.se-gui-sp.xml
index 176effeb..26fa03c7 100644
--- a/swamid-2.0/ladok3-p03.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p03.ladok.umu.se-gui-sp.xml
@@ -70,16 +70,16 @@ X1EbeNi162M=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p03.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p03.ladok.umu.se-student-sp.xml
index 9ffa9852..feb4f32e 100644
--- a/swamid-2.0/ladok3-p03.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p03.ladok.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ A9xJRBQ1Cid74sdTydvN7oXGrxxEQvQuI7fEnCar0aa6QEEjaUEdp7I06YI8gi5W
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p04.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p04.ladok.umu.se-gui-sp.xml
index acc177d7..73bb4d0f 100644
--- a/swamid-2.0/ladok3-p04.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p04.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ DX2pwiVvTPk=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p04.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p04.ladok.umu.se-student-sp.xml
index dbe9e696..06610575 100644
--- a/swamid-2.0/ladok3-p04.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p04.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ AP3USOeyGONOlpoZbgadSKbbuAKV
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p05.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p05.ladok.umu.se-gui-sp.xml
index 48cfb29e..c07ae3e6 100644
--- a/swamid-2.0/ladok3-p05.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p05.ladok.umu.se-gui-sp.xml
@@ -82,16 +82,16 @@ l0iIu524znU=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p05.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p05.ladok.umu.se-student-sp.xml
index 60bb02ed..85d7c4a7 100644
--- a/swamid-2.0/ladok3-p05.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p05.ladok.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ WUa2ZGEuSHVI+0BBeenW81T3KW7TAoOeDEwjAZf8foMfUxD8qbdOznZPyJl4Ou3G
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p06.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p06.ladok.umu.se-gui-sp.xml
index 62ce4036..537e67e4 100644
--- a/swamid-2.0/ladok3-p06.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p06.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ aQGrAxWq3Ik=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p06.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p06.ladok.umu.se-student-sp.xml
index fa93eee4..e880dea6 100644
--- a/swamid-2.0/ladok3-p06.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p06.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ PUO1EQo+arx4qeJ4W+ttDEFl+4Bd
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p07.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p07.ladok.umu.se-gui-sp.xml
index da0375e5..a4e526fd 100644
--- a/swamid-2.0/ladok3-p07.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p07.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ RTluWVSsQj+BYQ3yEKlXqYkzX+hnX3QUWjw40D4Eapo4h4ukwQu+z/rGvdxV3uE8
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p07.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p07.ladok.umu.se-student-sp.xml
index b1261c06..b150eb94 100644
--- a/swamid-2.0/ladok3-p07.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p07.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ sjb5y7JZIIlUvTDHyVuJ8+91ZMNg
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p08.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p08.ladok.umu.se-gui-sp.xml
index 9efafe61..4be464fb 100644
--- a/swamid-2.0/ladok3-p08.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p08.ladok.umu.se-gui-sp.xml
@@ -82,16 +82,16 @@ fqWfJvDp8n0tC/7e5JLo35GARrl61CZmX/XvdXGnWnNfGmHvbRXEg5rGdMQaiDTf
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p09.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p09.ladok.umu.se-gui-sp.xml
index 630a62ab..56dbad3d 100644
--- a/swamid-2.0/ladok3-p09.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p09.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ TCeJ826gy9aw8ndYfx861MJnmcNXv6S2RdEOOOXhEoilevMh/g6LenvBZQ6gcHRS
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p09.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p09.ladok.umu.se-student-sp.xml
index 1236d23e..0c7a51f1 100644
--- a/swamid-2.0/ladok3-p09.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p09.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ KrLP2rhVcVzanxwt02kjYwaqb4YH
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p10.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p10.ladok.umu.se-gui-sp.xml
index 82b31b20..ddb3c01c 100644
--- a/swamid-2.0/ladok3-p10.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p10.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ ijxYszxjc/c=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p10.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p10.ladok.umu.se-student-sp.xml
index 70e7ec66..a4d5ae37 100644
--- a/swamid-2.0/ladok3-p10.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p10.ladok.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ Kf/rBdzpvb8Tup6mlbQ86R159ZFLoJfwID6GLBr48B/w0PKBQeGoCAz1e55OF9pD
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p11.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p11.ladok.umu.se-gui-sp.xml
index 4f2aed04..d47bd98a 100644
--- a/swamid-2.0/ladok3-p11.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p11.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ HqwJ5D+Iif4elek44cMW3Jy6RM0LFYFkO79NvUoMFBCFySaM0MJEyYbtXSMw904x
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p11.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p11.ladok.umu.se-student-sp.xml
index 71e6835b..ff71dd4e 100644
--- a/swamid-2.0/ladok3-p11.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p11.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ gtXEZlr2dLe/argHthcqudmMquP8
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p12.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p12.ladok.umu.se-gui-sp.xml
index 6f2fd3c8..3d49cd8d 100644
--- a/swamid-2.0/ladok3-p12.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p12.ladok.umu.se-gui-sp.xml
@@ -95,16 +95,16 @@ mG1iR8k9mTI=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p12.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p12.ladok.umu.se-student-sp.xml
index 025be9c6..410cc2e7 100644
--- a/swamid-2.0/ladok3-p12.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p12.ladok.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ uqxBQkCvnX33vrqLW5c3nz5GznAD
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-processes.ladok.umu.se-securityrealm-finishlogin.xml b/swamid-2.0/ladok3-processes.ladok.umu.se-securityrealm-finishlogin.xml
index acbbcb66..63f9d963 100644
--- a/swamid-2.0/ladok3-processes.ladok.umu.se-securityrealm-finishlogin.xml
+++ b/swamid-2.0/ladok3-processes.ladok.umu.se-securityrealm-finishlogin.xml
@@ -82,16 +82,16 @@ N5PXNucNUWeBInrGL6LrbJdJ6Cwv5yk55oUNhcGpOGSPdiei0q8IFknj</ds:X509Certificate>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3.its.umu.se-shibboleth.xml b/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
index 923a1766..af6e4d1d 100644
--- a/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
@@ -97,16 +97,16 @@ vqX2O1UUS1leSB8AnvrsfuoKlZQQKgsrokXQTEo=
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3.its.umu.se-user-idp.xml b/swamid-2.0/ladok3.its.umu.se-user-idp.xml
index 0adb6969..a564e7fb 100644
--- a/swamid-2.0/ladok3.its.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3.its.umu.se-user-idp.xml
@@ -43,16 +43,16 @@ MIIBgTCCASugAwIBAgIJAILqNDVSOCaoMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMMEWxhZG9rMy5p
   <ContactPerson contactType="administrative">
     <Company>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/ladok3.ladok.umu.se-8443-jenkins-securityrealm-finishlogin.xml b/swamid-2.0/ladok3.ladok.umu.se-8443-jenkins-securityrealm-finishlogin.xml
index d8111280..e345fa65 100644
--- a/swamid-2.0/ladok3.ladok.umu.se-8443-jenkins-securityrealm-finishlogin.xml
+++ b/swamid-2.0/ladok3.ladok.umu.se-8443-jenkins-securityrealm-finishlogin.xml
@@ -71,16 +71,16 @@ Zt9koo0LwqrO6JAc0XcB96E3f2td2FHdIzwOS/IbzLPX6lXA</ds:X509Certificate>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml b/swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml
index e7ec5a00..828beb15 100644
--- a/swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml
+++ b/swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml
@@ -96,16 +96,16 @@ L8JKymQ3TDk/0a+t4y/ARC9bJ0ttOPY4K7WD21ddd0/xlz/AvA2g/f1Amlf0DC3T
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml
index d05cd9ec..fd1d0d30 100644
--- a/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml
@@ -90,16 +90,16 @@ aYnmCVGoNUbA+6Va0n9luhsqnA1TyI9HPOIbtbvAQ8kvU4ALw31YPGAxvzO1majX
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3edit.its.umu.se-student-sp.xml b/swamid-2.0/ladok3edit.its.umu.se-student-sp.xml
index 16137333..68c942f2 100644
--- a/swamid-2.0/ladok3edit.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3edit.its.umu.se-student-sp.xml
@@ -82,16 +82,16 @@ aXBwEQ==
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
index d26c11f4..073ca452 100644
--- a/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
@@ -94,16 +94,16 @@ UEv/iCMoAJgGFRraTZFMDldSSu+MjBUuCi4kZaUImeVa0yXr7qBwZmYvdqgddDKO
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3test.its.umu.se-student-sp.xml b/swamid-2.0/ladok3test.its.umu.se-student-sp.xml
index 38ce9473..c579eb09 100644
--- a/swamid-2.0/ladok3test.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3test.its.umu.se-student-sp.xml
@@ -96,16 +96,16 @@ P2PZ20jlVrEXyR8xypV/4ioJ1tSQ
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3test.its.umu.se-user-idp.xml b/swamid-2.0/ladok3test.its.umu.se-user-idp.xml
index 7f252801..d1ac03d7 100644
--- a/swamid-2.0/ladok3test.its.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3test.its.umu.se-user-idp.xml
@@ -43,16 +43,16 @@ MIIBiTCCATOgAwIBAgIJALdp5a/xlxT7MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNVBAMMFWxhZG9rM3Rl
   <ContactPerson contactType="administrative">
     <Company>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
-    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+    <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/led-jenkins.its.umu.se-securityrealm-finishlogin.xml b/swamid-2.0/led-jenkins.its.umu.se-securityrealm-finishlogin.xml
index 78e0ad7f..9ede5b64 100644
--- a/swamid-2.0/led-jenkins.its.umu.se-securityrealm-finishlogin.xml
+++ b/swamid-2.0/led-jenkins.its.umu.se-securityrealm-finishlogin.xml
@@ -82,16 +82,16 @@ UHBO2OxgB6kTfTRUobl+uVQ3HZbL8RSvI25ox/Gab43L9VxQvacM55Lc</ds:X509Certificate>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/login-dev.du.se-idp-shibboleth.xml b/swamid-2.0/login-dev.du.se-idp-shibboleth.xml
index c71be766..c3343cd5 100644
--- a/swamid-2.0/login-dev.du.se-idp-shibboleth.xml
+++ b/swamid-2.0/login-dev.du.se-idp-shibboleth.xml
@@ -81,6 +81,6 @@ xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=
   </Organization>
   <ContactPerson contactType="technical">
     <Company>Högskolan Dalarna</Company>
-    <EmailAddress>dempa@du.se</EmailAddress>
+    <EmailAddress>mailto:dempa@du.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/login.ifmsa.se-spp.xml b/swamid-2.0/login.ifmsa.se-spp.xml
index 033f6a40..75d9681f 100644
--- a/swamid-2.0/login.ifmsa.se-spp.xml
+++ b/swamid-2.0/login.ifmsa.se-spp.xml
@@ -38,6 +38,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Admin</md:GivenName>
-    <md:EmailAddress>admin@ifmsa.se</md:EmailAddress>
+    <md:EmailAddress>mailto:admin@ifmsa.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml b/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml
index 3d9d7b93..cd9a4031 100644
--- a/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml
+++ b/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml
@@ -43,6 +43,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Per</md:GivenName>
     <md:SurName>Newberg</md:SurName>
-    <md:EmailAddress>webmaster@mynetwork.se</md:EmailAddress>
+    <md:EmailAddress>mailto:webmaster@mynetwork.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml b/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml
index 432e6b1a..d978c6d3 100644
--- a/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml
@@ -56,7 +56,7 @@
   <ContactPerson contactType="support">
     <GivenName>IT</GivenName>
     <SurName>Support</SurName>
-    <EmailAddress>itsupport@hhs.se</EmailAddress>
+    <EmailAddress>mailto:itsupport@hhs.se</EmailAddress>
     <TelephoneNumber>+46 8 7369400</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/ltu.hr.evry.se-shibboleth.xml b/swamid-2.0/ltu.hr.evry.se-shibboleth.xml
index 204c3520..e61a4ee6 100644
--- a/swamid-2.0/ltu.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/ltu.hr.evry.se-shibboleth.xml
@@ -74,6 +74,6 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml b/swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml
index 3514a1b7..0886440d 100644
--- a/swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml
+++ b/swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml
@@ -40,6 +40,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Pontus</md:GivenName>
     <md:SurName>Uggla</md:SurName>
-    <md:EmailAddress>pontus@exigus.se</md:EmailAddress>
+    <md:EmailAddress>mailto:pontus@exigus.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml b/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml
index 6d13ec2a..6e4a8acf 100644
--- a/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml
+++ b/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml
@@ -81,6 +81,6 @@ uuNxKggJPJhRph8bitha6sR6EQ==</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>David</md:GivenName>
     <md:SurName>Holoshka</md:SurName>
-    <md:EmailAddress>david.holoshka@ub.lu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:david.holoshka@ub.lu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/mah.hr.evry.se-shibboleth.xml b/swamid-2.0/mah.hr.evry.se-shibboleth.xml
index 5823b608..8d383ad1 100644
--- a/swamid-2.0/mah.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/mah.hr.evry.se-shibboleth.xml
@@ -74,6 +74,6 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/mdh.hr.evry.se-shibboleth.xml b/swamid-2.0/mdh.hr.evry.se-shibboleth.xml
index 6e87571b..41073896 100644
--- a/swamid-2.0/mdh.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/mdh.hr.evry.se-shibboleth.xml
@@ -73,6 +73,6 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml
index 4a20d828..62b9fa06 100644
--- a/swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -25,6 +25,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>johan@montania.se</md:EmailAddress>
+    <md:EmailAddress>mailto:johan@montania.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.consensus.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.consensus.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index dd5f9242..827685b0 100644
--- a/swamid-2.0/medlem.consensus.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.consensus.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -40,6 +40,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>webb@montania.se</md:EmailAddress>
+    <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index d036cc0c..8af3d48a 100644
--- a/swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -40,6 +40,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>webb@montania.se</md:EmailAddress>
+    <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 53d2be42..92df84b1 100644
--- a/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -39,6 +39,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>webb@montania.se</md:EmailAddress>
+    <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index b20760e8..0614d51f 100644
--- a/swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -41,6 +41,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>johan@montania.se</md:EmailAddress>
+    <md:EmailAddress>mailto:johan@montania.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.lintek.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.lintek.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 4c40343f..7b11d94d 100644
--- a/swamid-2.0/medlem.lintek.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.lintek.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -40,6 +40,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>webb@montania.se</md:EmailAddress>
+    <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index d17c8de3..de9e128d 100644
--- a/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -39,6 +39,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>webb@montania.se</md:EmailAddress>
+    <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 817184b3..8dc36efa 100644
--- a/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -41,6 +41,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>johan@montania.se</md:EmailAddress>
+    <md:EmailAddress>mailto:johan@montania.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.stuff.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.stuff.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 7751b612..5bc3d283 100644
--- a/swamid-2.0/medlem.stuff.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.stuff.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -40,6 +40,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>webb@montania.se</md:EmailAddress>
+    <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.sus.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.sus.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 20cd16dd..03cd3fe7 100644
--- a/swamid-2.0/medlem.sus.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.sus.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -40,6 +40,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>webb@montania.se</md:EmailAddress>
+    <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/meetingtools-dev.app.nordu.net-saml2-sp-metadata.xml b/swamid-2.0/meetingtools-dev.app.nordu.net-saml2-sp-metadata.xml
index 3982ce5c..607094dc 100644
--- a/swamid-2.0/meetingtools-dev.app.nordu.net-saml2-sp-metadata.xml
+++ b/swamid-2.0/meetingtools-dev.app.nordu.net-saml2-sp-metadata.xml
@@ -52,6 +52,6 @@ wXXiBDXS3PNHXQnnpys=
     <md:Company>NORDUnet</md:Company>
     <md:GivenName>Leif</md:GivenName>
     <md:SurName>Johansson</md:SurName>
-    <md:EmailAddress>leifj@nordu.net</md:EmailAddress>
+    <md:EmailAddress>mailto:leifj@nordu.net</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/moodle.lhs.se-shibboleth.xml b/swamid-2.0/moodle.lhs.se-shibboleth.xml
index e920ab9d..0131c7e3 100644
--- a/swamid-2.0/moodle.lhs.se-shibboleth.xml
+++ b/swamid-2.0/moodle.lhs.se-shibboleth.xml
@@ -42,6 +42,6 @@ t7tgUUB+rUENHrqryPN6AJ6QZR6UIWE6J6biQJVmXQldKGrGrMEnRecGyokj9kqi</ds:X509Certifi
   <ContactPerson contactType="technical">
     <Company>Stockholm university</Company>
     <SurName>helpdesk</SurName>
-    <EmailAddress>helpdesk@it.su.se</EmailAddress>
+    <EmailAddress>mailto:helpdesk@it.su.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml b/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml
index 3832c5a9..514d4cda 100644
--- a/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml
+++ b/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml
@@ -89,6 +89,6 @@ IPtsyyR5LVUuRnyvOaw=
   <md:ContactPerson contactType="technical">
     <md:GivenName>Peter</md:GivenName>
     <md:SurName>Möller</md:SurName>
-    <md:EmailAddress>peter.moller@cs.lth.se</md:EmailAddress>
+    <md:EmailAddress>mailto:peter.moller@cs.lth.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ni.nordu.net-saml2-metadata.xml b/swamid-2.0/ni.nordu.net-saml2-metadata.xml
index e2f426ec..8c1ea728 100644
--- a/swamid-2.0/ni.nordu.net-saml2-metadata.xml
+++ b/swamid-2.0/ni.nordu.net-saml2-metadata.xml
@@ -44,6 +44,6 @@ GtDqiUnI4ewwuxmNcK7kU1vUmBsiKlS5lyo8c+hpTA==
     <md:Company>NORDUnet A/S</md:Company>
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Lundberg</md:SurName>
-    <md:EmailAddress>lundberg@nordu.net</md:EmailAddress>
+    <md:EmailAddress>mailto:lundberg@nordu.net</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml b/swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml
index 723f7019..71c6440d 100644
--- a/swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml
+++ b/swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml
@@ -46,6 +46,6 @@ Z+RKbg==
     <md:Company>NORDUnet A/S</md:Company>
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Lundberg</md:SurName>
-    <md:EmailAddress>lundberg@nordu.net</md:EmailAddress>
+    <md:EmailAddress>mailto:lundberg@nordu.net</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/openidp.feide.no.xml b/swamid-2.0/openidp.feide.no.xml
index 2762f30f..ec6e935e 100644
--- a/swamid-2.0/openidp.feide.no.xml
+++ b/swamid-2.0/openidp.feide.no.xml
@@ -22,6 +22,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Andreas</md:GivenName>
     <md:SurName>Åkre Solberg</md:SurName>
-    <md:EmailAddress>andreas@uninett.no</md:EmailAddress>
+    <md:EmailAddress>mailto:andreas@uninett.no</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.bth.se.xml b/swamid-2.0/play.bth.se.xml
index 20a1dbe6..e24a163d 100644
--- a/swamid-2.0/play.bth.se.xml
+++ b/swamid-2.0/play.bth.se.xml
@@ -42,6 +42,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>NORDUnet</md:GivenName>
     <md:SurName>SAML Admin</md:SurName>
-    <md:EmailAddress>saml@media.nordu.net</md:EmailAddress>
+    <md:EmailAddress>mailto:saml@media.nordu.net</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.fhs.se.xml b/swamid-2.0/play.fhs.se.xml
index 51524b90..6ce3ba81 100644
--- a/swamid-2.0/play.fhs.se.xml
+++ b/swamid-2.0/play.fhs.se.xml
@@ -42,6 +42,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.gu.se.xml b/swamid-2.0/play.gu.se.xml
index b893316b..a05ad10c 100644
--- a/swamid-2.0/play.gu.se.xml
+++ b/swamid-2.0/play.gu.se.xml
@@ -46,6 +46,6 @@ MIIENjCCAx6gAwIBAgIJAKLxSTc8gMTfMA0GCSqGSIb3DQEBBQUAMG8xCzAJBgNVBAYTAlNFMRMwEQYD
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.hig.se.xml b/swamid-2.0/play.hig.se.xml
index dc5cf068..c43395b2 100644
--- a/swamid-2.0/play.hig.se.xml
+++ b/swamid-2.0/play.hig.se.xml
@@ -45,6 +45,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.hj.se.xml b/swamid-2.0/play.hj.se.xml
index cab0b08d..e63ed71e 100644
--- a/swamid-2.0/play.hj.se.xml
+++ b/swamid-2.0/play.hj.se.xml
@@ -45,6 +45,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.hkr.se.xml b/swamid-2.0/play.hkr.se.xml
index caf6a541..9508aab1 100644
--- a/swamid-2.0/play.hkr.se.xml
+++ b/swamid-2.0/play.hkr.se.xml
@@ -45,6 +45,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.hv.se.xml b/swamid-2.0/play.hv.se.xml
index 6cfed1b6..77b341fb 100644
--- a/swamid-2.0/play.hv.se.xml
+++ b/swamid-2.0/play.hv.se.xml
@@ -42,6 +42,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.kth.se-external-kaltura.com.xml b/swamid-2.0/play.kth.se-external-kaltura.com.xml
index df94af76..fa5e88ae 100644
--- a/swamid-2.0/play.kth.se-external-kaltura.com.xml
+++ b/swamid-2.0/play.kth.se-external-kaltura.com.xml
@@ -79,6 +79,6 @@ jyfJSjzHuZ9xMjMF/qdblGtl222vyg==
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml b/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
index efe96f1f..53e1060b 100644
--- a/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
+++ b/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
@@ -43,6 +43,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.ltu.se.xml b/swamid-2.0/play.ltu.se.xml
index f6af899b..a3f30029 100644
--- a/swamid-2.0/play.ltu.se.xml
+++ b/swamid-2.0/play.ltu.se.xml
@@ -42,6 +42,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.mah.se.xml b/swamid-2.0/play.mah.se.xml
index ab5860f3..200e32c0 100644
--- a/swamid-2.0/play.mah.se.xml
+++ b/swamid-2.0/play.mah.se.xml
@@ -42,6 +42,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.miun.se.xml b/swamid-2.0/play.miun.se.xml
index 2f2a29fb..6b77d2af 100644
--- a/swamid-2.0/play.miun.se.xml
+++ b/swamid-2.0/play.miun.se.xml
@@ -45,6 +45,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.oru.se.xml b/swamid-2.0/play.oru.se.xml
index bfb3cc83..23fbcfb9 100644
--- a/swamid-2.0/play.oru.se.xml
+++ b/swamid-2.0/play.oru.se.xml
@@ -42,6 +42,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.rkh.se.xml b/swamid-2.0/play.rkh.se.xml
index afd9dc51..4f902e86 100644
--- a/swamid-2.0/play.rkh.se.xml
+++ b/swamid-2.0/play.rkh.se.xml
@@ -42,6 +42,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.sh.se.xml b/swamid-2.0/play.sh.se.xml
index 9cd72df0..58441a1a 100644
--- a/swamid-2.0/play.sh.se.xml
+++ b/swamid-2.0/play.sh.se.xml
@@ -43,6 +43,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>NORDUnet</md:GivenName>
     <md:SurName>SAML Admin</md:SurName>
-    <md:EmailAddress>saml@media.nordu.net</md:EmailAddress>
+    <md:EmailAddress>mailto:saml@media.nordu.net</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.shh.se.xml b/swamid-2.0/play.shh.se.xml
index 05fa88e2..456e70e3 100644
--- a/swamid-2.0/play.shh.se.xml
+++ b/swamid-2.0/play.shh.se.xml
@@ -43,6 +43,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>NORDUnet</md:GivenName>
     <md:SurName>SAML Admin</md:SurName>
-    <md:EmailAddress>saml@media.nordu.net</md:EmailAddress>
+    <md:EmailAddress>mailto:saml@media.nordu.net</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.sunet.se.xml b/swamid-2.0/play.sunet.se.xml
index e41b64e4..25e4f389 100644
--- a/swamid-2.0/play.sunet.se.xml
+++ b/swamid-2.0/play.sunet.se.xml
@@ -34,6 +34,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.umu.se.xml b/swamid-2.0/play.umu.se.xml
index 41cdd34c..83de529a 100644
--- a/swamid-2.0/play.umu.se.xml
+++ b/swamid-2.0/play.umu.se.xml
@@ -42,6 +42,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 091c33e8..d0adf391 100644
--- a/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -49,6 +49,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>johan@montania.se</md:EmailAddress>
+    <md:EmailAddress>mailto:johan@montania.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index a0f87309..abbcfa33 100644
--- a/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -48,6 +48,6 @@ Dpkx/wL59aMiGk9AtYes2Mr1wU44nh2/JRWkSRBU4Ep+sb9jRFbn4/RZaNZqRnc=
   <md:ContactPerson contactType="technical">
     <md:GivenName>Alexander</md:GivenName>
     <md:SurName>Dangler</md:SurName>
-    <md:EmailAddress>alexander.dangler@gmail.com</md:EmailAddress>
+    <md:EmailAddress>mailto:alexander.dangler@gmail.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/primula.lnu.se-shibboleth.xml b/swamid-2.0/primula.lnu.se-shibboleth.xml
index 3c3a2b4d..4576b155 100644
--- a/swamid-2.0/primula.lnu.se-shibboleth.xml
+++ b/swamid-2.0/primula.lnu.se-shibboleth.xml
@@ -81,6 +81,6 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/primula.mah.se-shibboleth.xml b/swamid-2.0/primula.mah.se-shibboleth.xml
index b08961a5..8e3426a5 100644
--- a/swamid-2.0/primula.mah.se-shibboleth.xml
+++ b/swamid-2.0/primula.mah.se-shibboleth.xml
@@ -70,6 +70,6 @@ r4tfM1hij14r1PrjpJUPif6LEWVzjs23O6VQoKe7oEXlBwFRfw==
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml b/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml
index 133451ce..bf1f9cef 100644
--- a/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml
+++ b/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml
@@ -83,6 +83,6 @@ l27vPw5wc7vuymARYxUEaDSRqL1Tzk784JGsGeoAhGMMjJp+IiYC6rtRDOD43rsZ
   </Organization>
   <ContactPerson contactType="technical">
     <Company>SUNET</Company>
-    <EmailAddress>operations@skolfederation.se</EmailAddress>
+    <EmailAddress>mailto:operations@skolfederation.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml b/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml
index 29cdf197..bbc32542 100644
--- a/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml
+++ b/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml
@@ -80,21 +80,21 @@ oMzgMjdgVTXdBPqXjdsunjPAiOZnJesxtLgWYEmQ
     <md:Company>NORDUnet</md:Company>
     <md:GivenName>Leif</md:GivenName>
     <md:SurName>Johansson</md:SurName>
-    <md:EmailAddress>leifj@sunet.se</md:EmailAddress>
+    <md:EmailAddress>mailto:leifj@sunet.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>Fredrik</md:GivenName>
     <md:SurName>Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Fredrik</md:GivenName>
     <md:SurName>Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Fredrik</md:GivenName>
     <md:SurName>Domeij</md:SurName>
-    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/registry.swamid.se-saml2-metadata.xml b/swamid-2.0/registry.swamid.se-saml2-metadata.xml
index e047aa45..4655ab1e 100644
--- a/swamid-2.0/registry.swamid.se-saml2-metadata.xml
+++ b/swamid-2.0/registry.swamid.se-saml2-metadata.xml
@@ -63,12 +63,12 @@ jkl44jhVvXLSythVxryo/Mf7b8QbicsObxpxFMb9ifVbWyi5ri0WLgvQAXpyw/MH
     <md:Company>SWAMID</md:Company>
     <md:GivenName>Anders</md:GivenName>
     <md:SurName>Lordal</md:SurName>
-    <md:EmailAddress>anders.lordal@hig.se</md:EmailAddress>
+    <md:EmailAddress>mailto:anders.lordal@hig.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:Company>SWAMID</md:Company>
     <md:GivenName>Anders</md:GivenName>
     <md:SurName>Lordal</md:SurName>
-    <md:EmailAddress>anders.lordal@hig.se</md:EmailAddress>
+    <md:EmailAddress>mailto:anders.lordal@hig.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/sam.control.lth.se-shibboleth.xml b/swamid-2.0/sam.control.lth.se-shibboleth.xml
index 40d8917e..3b21de36 100644
--- a/swamid-2.0/sam.control.lth.se-shibboleth.xml
+++ b/swamid-2.0/sam.control.lth.se-shibboleth.xml
@@ -94,6 +94,6 @@ R83DjysdqOkJezZxfXnsgdhDpyo=
   <md:ContactPerson contactType="technical">
     <md:GivenName>Anders</md:GivenName>
     <md:SurName>Nilsson</md:SurName>
-    <md:EmailAddress>anders.nilsson@control.lth.se</md:EmailAddress>
+    <md:EmailAddress>mailto:anders.nilsson@control.lth.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/samsok.libris.kb.se-shibboleth.xml b/swamid-2.0/samsok.libris.kb.se-shibboleth.xml
index d5e9866c..0dc1ae47 100644
--- a/swamid-2.0/samsok.libris.kb.se-shibboleth.xml
+++ b/swamid-2.0/samsok.libris.kb.se-shibboleth.xml
@@ -19,6 +19,6 @@
     <Company>Kungliga Biblioteket</Company>
     <GivenName>Arvid</GivenName>
     <SurName>Oja</SurName>
-    <EmailAddress>arvid.oja@kb.se</EmailAddress>
+    <EmailAddress>mailto:arvid.oja@kb.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-bth-staff.xml b/swamid-2.0/se.timeedit.net-bth-staff.xml
index 344b2357..eaff1b9e 100644
--- a/swamid-2.0/se.timeedit.net-bth-staff.xml
+++ b/swamid-2.0/se.timeedit.net-bth-staff.xml
@@ -39,6 +39,6 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-bth-stud.xml b/swamid-2.0/se.timeedit.net-bth-stud.xml
index 470005f9..b575247d 100644
--- a/swamid-2.0/se.timeedit.net-bth-stud.xml
+++ b/swamid-2.0/se.timeedit.net-bth-stud.xml
@@ -39,6 +39,6 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-chalmers-sp.xml b/swamid-2.0/se.timeedit.net-chalmers-sp.xml
index 9b8cbfcb..96baabf6 100644
--- a/swamid-2.0/se.timeedit.net-chalmers-sp.xml
+++ b/swamid-2.0/se.timeedit.net-chalmers-sp.xml
@@ -38,6 +38,6 @@ GImnaeS4</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-kth-employee-sp.xml b/swamid-2.0/se.timeedit.net-kth-employee-sp.xml
index 7b71a2a5..ece85d87 100644
--- a/swamid-2.0/se.timeedit.net-kth-employee-sp.xml
+++ b/swamid-2.0/se.timeedit.net-kth-employee-sp.xml
@@ -39,6 +39,6 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-lapinamk-generic-sp.xml b/swamid-2.0/se.timeedit.net-lapinamk-generic-sp.xml
index f24f7fb8..d8789c8b 100644
--- a/swamid-2.0/se.timeedit.net-lapinamk-generic-sp.xml
+++ b/swamid-2.0/se.timeedit.net-lapinamk-generic-sp.xml
@@ -54,6 +54,6 @@ GImnaeS4</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-lu-employee-sp.xml b/swamid-2.0/se.timeedit.net-lu-employee-sp.xml
index 448603a9..2389efe1 100644
--- a/swamid-2.0/se.timeedit.net-lu-employee-sp.xml
+++ b/swamid-2.0/se.timeedit.net-lu-employee-sp.xml
@@ -46,6 +46,6 @@ GImnaeS4</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-lu-student-sp.xml b/swamid-2.0/se.timeedit.net-lu-student-sp.xml
index b1be2c1b..2824a93b 100644
--- a/swamid-2.0/se.timeedit.net-lu-student-sp.xml
+++ b/swamid-2.0/se.timeedit.net-lu-student-sp.xml
@@ -46,6 +46,6 @@ GImnaeS4</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-saimia-generic-sp.xml b/swamid-2.0/se.timeedit.net-saimia-generic-sp.xml
index 06dc5d53..11f034e1 100644
--- a/swamid-2.0/se.timeedit.net-saimia-generic-sp.xml
+++ b/swamid-2.0/se.timeedit.net-saimia-generic-sp.xml
@@ -53,6 +53,6 @@ GImnaeS4</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-su-employee-sp.xml b/swamid-2.0/se.timeedit.net-su-employee-sp.xml
index d21febc7..8c0bc3e6 100644
--- a/swamid-2.0/se.timeedit.net-su-employee-sp.xml
+++ b/swamid-2.0/se.timeedit.net-su-employee-sp.xml
@@ -38,6 +38,6 @@ GImnaeS4</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-su-student-sp.xml b/swamid-2.0/se.timeedit.net-su-student-sp.xml
index 26fede15..3664f3c1 100644
--- a/swamid-2.0/se.timeedit.net-su-student-sp.xml
+++ b/swamid-2.0/se.timeedit.net-su-student-sp.xml
@@ -38,6 +38,6 @@ GImnaeS4</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-umu-employee-sp.xml b/swamid-2.0/se.timeedit.net-umu-employee-sp.xml
index 7b9ff508..413dcaf9 100644
--- a/swamid-2.0/se.timeedit.net-umu-employee-sp.xml
+++ b/swamid-2.0/se.timeedit.net-umu-employee-sp.xml
@@ -46,6 +46,6 @@ GImnaeS4</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-umu-student-sp.xml b/swamid-2.0/se.timeedit.net-umu-student-sp.xml
index 9f387594..5026f7fd 100644
--- a/swamid-2.0/se.timeedit.net-umu-student-sp.xml
+++ b/swamid-2.0/se.timeedit.net-umu-student-sp.xml
@@ -46,6 +46,6 @@ GImnaeS4</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml
index 7d93e856..fe0616dc 100644
--- a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml
+++ b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml
@@ -46,6 +46,6 @@ GImnaeS4</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
index e89ef6ed..e3351614 100644
--- a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
+++ b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
@@ -46,6 +46,6 @@ GImnaeS4</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/secure.port.se-shibboleth.xml b/swamid-2.0/secure.port.se-shibboleth.xml
index f738467e..f35182cd 100644
--- a/swamid-2.0/secure.port.se-shibboleth.xml
+++ b/swamid-2.0/secure.port.se-shibboleth.xml
@@ -87,6 +87,6 @@ VaVIi9tnmwAwQSVBw0L1rPCgy5X91UScJk5EIDL1Z8VO+7gnJmh73cvgL/7tfR8Z
   <md:ContactPerson contactType="technical">
     <md:GivenName>Lennart</md:GivenName>
     <md:SurName>Risfelt</md:SurName>
-    <md:EmailAddress>lennart@port.se</md:EmailAddress>
+    <md:EmailAddress>mailto:lennart@port.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/service.projectplace.com-saml-metadata.xml b/swamid-2.0/service.projectplace.com-saml-metadata.xml
index 1ace07ff..4b6fc3e3 100644
--- a/swamid-2.0/service.projectplace.com-saml-metadata.xml
+++ b/swamid-2.0/service.projectplace.com-saml-metadata.xml
@@ -44,9 +44,9 @@ qn0pH3p8ik4RiHD3Od8k9acHCj/dO4PyTbAjgYuUS23yUBbJOmow6eje/HNpQs9E
     <md:OrganizationURL xml:lang="en">https://www.projectplace.com/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
-    <md:EmailAddress>support@projectplace.com</md:EmailAddress>
+    <md:EmailAddress>mailto:support@projectplace.com</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:EmailAddress>saml@projectplace.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml@projectplace.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/sesam.uu.se-shibboleth.xml b/swamid-2.0/sesam.uu.se-shibboleth.xml
index 13c21300..bf60fab8 100644
--- a/swamid-2.0/sesam.uu.se-shibboleth.xml
+++ b/swamid-2.0/sesam.uu.se-shibboleth.xml
@@ -72,7 +72,7 @@ Ob0pZI5pkqdbQ/X+dGRz0ifwq1CQ44OjMnFi
   <md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
     <md:SurName>IT Servicedesk</md:SurName>
-    <md:EmailAddress>helpdesk@uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:helpdesk@uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml
index 7e5219c2..559139d1 100644
--- a/swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml
@@ -81,6 +81,6 @@ A7VlBNLOTweEKWEGoMAE8meALW+o3Q8ZC3GUFyi6zV3L92x6xwb0YyNnYpS/wf0U
   </Organization>
   <ContactPerson contactType="technical">
     <Company>Royal Institute of Technology (KTH)</Company>
-    <EmailAddress>itesc@kth.se</EmailAddress>
+    <EmailAddress>mailto:itesc@kth.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
index b239d6ea..f47ac84f 100644
--- a/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
@@ -187,6 +187,6 @@ d3hB7quCN72lcAz/8iZU
   <ContactPerson contactType="technical">
     <GivenName>Jonny</GivenName>
     <SurName>Ehrnberg</SurName>
-    <EmailAddress>jonny.ehrnberg@oru.se</EmailAddress>
+    <EmailAddress>mailto:jonny.ehrnberg@oru.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/shib1.oru.se-shibboleth.xml b/swamid-2.0/shib1.oru.se-shibboleth.xml
index 4bd5e9a2..635e023f 100644
--- a/swamid-2.0/shib1.oru.se-shibboleth.xml
+++ b/swamid-2.0/shib1.oru.se-shibboleth.xml
@@ -116,7 +116,7 @@ Rqzek48aKj1lgjemCqPvuxaeTjFaQej9JLrxyQ1cWvsSYLuW4wnq4uvKdFRKr1hP
   <md:ContactPerson contactType="technical">
     <md:Company>Örebro University</md:Company>
     <md:SurName>Jonny Ehrnberg</md:SurName>
-    <md:EmailAddress>itsupport@oru.se</md:EmailAddress>
+    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
     <md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
index b1c402e0..9941aee8 100644
--- a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
@@ -101,19 +101,19 @@ UIW4Y6GzlL7EfXr31lnv
   <ContactPerson contactType="administrative">
     <Company>The Swedish Council for Higher Education</Company>
     <SurName>Anders Brouzell</SurName>
-    <EmailAddress>anders.brouzell@uhr.se</EmailAddress>
+    <EmailAddress>mailto:anders.brouzell@uhr.se</EmailAddress>
     <TelephoneNumber>070-839 62 36</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>The Swedish Council for Higher Education</Company>
     <SurName>Anders Brouzell</SurName>
-    <EmailAddress>anders.brouzell@uhr.se</EmailAddress>
+    <EmailAddress>mailto:anders.brouzell@uhr.se</EmailAddress>
     <TelephoneNumber>+46 70839 62 36</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>The Swedish Council for Higher Education</Company>
     <SurName>Anders Brouzell</SurName>
-    <EmailAddress>anders.brouzell@uhr.se</EmailAddress>
+    <EmailAddress>mailto:anders.brouzell@uhr.se</EmailAddress>
     <TelephoneNumber>+46 70839 62 36</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml b/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml
index 6306fe2b..05002289 100644
--- a/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml
@@ -50,6 +50,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Leif</md:GivenName>
     <md:SurName>Johansson</md:SurName>
-    <md:EmailAddress>leifj@sunet.se</md:EmailAddress>
+    <md:EmailAddress>mailto:leifj@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml b/swamid-2.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml
index af47477f..ccec7dd1 100644
--- a/swamid-2.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml
+++ b/swamid-2.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml
@@ -12,6 +12,6 @@
   </SPSSODescriptor>
   <ContactPerson contactType="technical">
     <SurName>Administrator</SurName>
-    <EmailAddress>henrik.austad@uninett.no</EmailAddress>
+    <EmailAddress>mailto:henrik.austad@uninett.no</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/sp.lhs.se-shibboleth.xml b/swamid-2.0/sp.lhs.se-shibboleth.xml
index e5fd511c..1ae7eba4 100644
--- a/swamid-2.0/sp.lhs.se-shibboleth.xml
+++ b/swamid-2.0/sp.lhs.se-shibboleth.xml
@@ -19,6 +19,6 @@
     <Company>LHS</Company>
     <GivenName>Patrik</GivenName>
     <SurName>Blomkvist</SurName>
-    <EmailAddress>patrik.blomkvist@lhs.se</EmailAddress>
+    <EmailAddress>mailto:patrik.blomkvist@lhs.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/spadfs.it.gu.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/spadfs.it.gu.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 274bcba3..1bd2025d 100644
--- a/swamid-2.0/spadfs.it.gu.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/spadfs.it.gu.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -46,6 +46,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Tobias</md:GivenName>
     <md:SurName>Galeus</md:SurName>
-    <md:EmailAddress>tobias.galeus@gu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:tobias.galeus@gu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml b/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml
index ea080dd6..cd22cd0a 100644
--- a/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml
+++ b/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml
@@ -61,6 +61,6 @@ lQDSN7w4inBTDBIKvjWfVg==</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:Company>Uppsala universitet</md:Company>
     <md:SurName>Stipendiehantering</md:SurName>
-    <md:EmailAddress>stipendie-datordrift@its.uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:stipendie-datordrift@its.uu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.mit-ik.ladok.se-student-sp.xml b/swamid-2.0/student.mit-ik.ladok.se-student-sp.xml
index ff7d4e00..ede16c8f 100644
--- a/swamid-2.0/student.mit-ik.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.mit-ik.ladok.se-student-sp.xml
@@ -77,19 +77,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.mit-integration.ladok.se-student-sp.xml b/swamid-2.0/student.mit-integration.ladok.se-student-sp.xml
index 46abbc12..0e15bccf 100644
--- a/swamid-2.0/student.mit-integration.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.mit-integration.ladok.se-student-sp.xml
@@ -77,19 +77,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.mit.ladok.se-student-sp.xml b/swamid-2.0/student.mit.ladok.se-student-sp.xml
index d6e7ee42..50dec3da 100644
--- a/swamid-2.0/student.mit.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.mit.ladok.se-student-sp.xml
@@ -77,19 +77,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.test.ladok.se-student-sp.xml b/swamid-2.0/student.test.ladok.se-student-sp.xml
index f84c0cff..34740494 100644
--- a/swamid-2.0/student.test.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.test.ladok.se-student-sp.xml
@@ -77,19 +77,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.utb2.ladok.se-student-sp.xml b/swamid-2.0/student.utb2.ladok.se-student-sp.xml
index 21164139..099f9629 100644
--- a/swamid-2.0/student.utb2.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.utb2.ladok.se-student-sp.xml
@@ -77,19 +77,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.utb3.ladok.se-student-sp.xml b/swamid-2.0/student.utb3.ladok.se-student-sp.xml
index 6ed77bc2..b470616a 100644
--- a/swamid-2.0/student.utb3.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.utb3.ladok.se-student-sp.xml
@@ -77,19 +77,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.utbildning.ladok.se-student-sp.xml b/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
index ecc83af0..10e47a50 100644
--- a/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
@@ -77,19 +77,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.verifiering1.ladok.se-student-sp.xml b/swamid-2.0/student.verifiering1.ladok.se-student-sp.xml
index e1976d02..14224b38 100644
--- a/swamid-2.0/student.verifiering1.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.verifiering1.ladok.se-student-sp.xml
@@ -77,19 +77,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.verifiering2.ladok.se-student-sp.xml b/swamid-2.0/student.verifiering2.ladok.se-student-sp.xml
index 93f26c04..d6b056d1 100644
--- a/swamid-2.0/student.verifiering2.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.verifiering2.ladok.se-student-sp.xml
@@ -77,19 +77,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml b/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml
index ff29db47..1ccd4ff7 100644
--- a/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml
@@ -77,19 +77,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml
index 5eb81b40..077131ed 100644
--- a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml
+++ b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml
@@ -38,6 +38,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Svensk E-identitet / GrandID Support</md:GivenName>
-    <md:EmailAddress>support@grandid.com</md:EmailAddress>
+    <md:EmailAddress>mailto:support@grandid.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index 0f786a7a..ebf1ca6b 100644
--- a/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -41,6 +41,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>UvT</md:GivenName>
     <md:SurName>LIS Unix</md:SurName>
-    <md:EmailAddress>na@example.org</md:EmailAddress>
+    <md:EmailAddress>mailto:na@example.org</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index 98a65222..d75b0f6d 100644
--- a/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -33,6 +33,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>UvT</md:GivenName>
     <md:SurName>LIS Unix</md:SurName>
-    <md:EmailAddress>lis-unix@uvt.nl</md:EmailAddress>
+    <md:EmailAddress>mailto:lis-unix@uvt.nl</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index a29adacf..6fac0b38 100644
--- a/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -33,6 +33,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>UvT</md:GivenName>
     <md:SurName>LIS Unix</md:SurName>
-    <md:EmailAddress>lis-unix@uvt.nl</md:EmailAddress>
+    <md:EmailAddress>mailto:lis-unix@uvt.nl</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml b/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
index 1c34de10..32adb7d3 100644
--- a/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
+++ b/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
@@ -72,17 +72,17 @@
   <ContactPerson contactType="support">
     <GivenName>Johan</GivenName>
     <SurName>Göthberg</SurName>
-    <EmailAddress>johan.gothberg@statenssc.se</EmailAddress>
+    <EmailAddress>mailto:johan.gothberg@statenssc.se</EmailAddress>
     <TelephoneNumber>0771456000</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="administrative">
     <SurName>Johan Larsson</SurName>
-    <EmailAddress>johan.larsson@statenssc.se</EmailAddress>
+    <EmailAddress>mailto:johan.larsson@statenssc.se</EmailAddress>
     <TelephoneNumber>+46 10-456 03 10</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <SurName>Lars Forsgren</SurName>
-    <EmailAddress>lars.forsgren@tieto.com</EmailAddress>
+    <EmailAddress>mailto:lars.forsgren@tieto.com</EmailAddress>
     <TelephoneNumber>+46 10-481 01 97</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/test-his.hr.evry.se-shibboleth.xml b/swamid-2.0/test-his.hr.evry.se-shibboleth.xml
index 35fc8d2b..aaf5c965 100644
--- a/swamid-2.0/test-his.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-his.hr.evry.se-shibboleth.xml
@@ -64,6 +64,6 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/test-hkr.hr.evry.se-shibboleth.xml b/swamid-2.0/test-hkr.hr.evry.se-shibboleth.xml
index a42a0be7..55161325 100644
--- a/swamid-2.0/test-hkr.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-hkr.hr.evry.se-shibboleth.xml
@@ -64,6 +64,6 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml b/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml
index 531fd794..1fc7d079 100644
--- a/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml
@@ -71,6 +71,6 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml b/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml
index b81d1538..4f855d48 100644
--- a/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml
@@ -78,6 +78,6 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/test-mah.hr.evry.se-shibboleth.xml b/swamid-2.0/test-mah.hr.evry.se-shibboleth.xml
index bb4fda09..c7eef602 100644
--- a/swamid-2.0/test-mah.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-mah.hr.evry.se-shibboleth.xml
@@ -64,6 +64,6 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/test-mdh.hr.evry.se-shibboleth.xml b/swamid-2.0/test-mdh.hr.evry.se-shibboleth.xml
index 844fcb4b..a4a06fdf 100644
--- a/swamid-2.0/test-mdh.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-mdh.hr.evry.se-shibboleth.xml
@@ -70,6 +70,6 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
   <md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/test.account.hj.se-adfs-services-trust.xml b/swamid-2.0/test.account.hj.se-adfs-services-trust.xml
index 2877954e..5aba7418 100644
--- a/swamid-2.0/test.account.hj.se-adfs-services-trust.xml
+++ b/swamid-2.0/test.account.hj.se-adfs-services-trust.xml
@@ -54,6 +54,6 @@
   <ContactPerson contactType="technical">
     <GivenName>Joakim</GivenName>
     <SurName>Danielsson</SurName>
-    <EmailAddress>swamid@ju.se</EmailAddress>
+    <EmailAddress>mailto:swamid@ju.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/test.bils.se-auth-metadata.xml b/swamid-2.0/test.bils.se-auth-metadata.xml
index 560acf52..272f51dd 100644
--- a/swamid-2.0/test.bils.se-auth-metadata.xml
+++ b/swamid-2.0/test.bils.se-auth-metadata.xml
@@ -99,6 +99,6 @@
   <md:ContactPerson contactType="technical">
     <md:GivenName>Frédéric</md:GivenName>
     <md:SurName>Haziza</md:SurName>
-    <md:EmailAddress>daz@bils.se</md:EmailAddress>
+    <md:EmailAddress>mailto:daz@bils.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/test.itslearning.com.xml b/swamid-2.0/test.itslearning.com.xml
index 06cd9ef8..d26fa307 100644
--- a/swamid-2.0/test.itslearning.com.xml
+++ b/swamid-2.0/test.itslearning.com.xml
@@ -80,9 +80,9 @@ L0Gxkp4Wyq0nkpjQ4E2v9nFsPiXf4kL8Cc7Oa87n</ds:X509Certificate>
     <OrganizationURL xml:lang="en">http://www.itslearning.eu</OrganizationURL>
   </Organization>
   <ContactPerson xml:lang="en" contactType="technical">
-    <EmailAddress>support@itslearning.com</EmailAddress>
+    <EmailAddress>mailto:support@itslearning.com</EmailAddress>
   </ContactPerson>
   <ContactPerson xml:lang="en" contactType="support">
-    <EmailAddress>support@itslearning.com</EmailAddress>
+    <EmailAddress>mailto:support@itslearning.com</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/test.play.hv.se.xml b/swamid-2.0/test.play.hv.se.xml
index 6ae9137a..6fe888c6 100644
--- a/swamid-2.0/test.play.hv.se.xml
+++ b/swamid-2.0/test.play.hv.se.xml
@@ -42,6 +42,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/test.play.mdh.se.xml b/swamid-2.0/test.play.mdh.se.xml
index cb86e8e3..ede0354f 100644
--- a/swamid-2.0/test.play.mdh.se.xml
+++ b/swamid-2.0/test.play.mdh.se.xml
@@ -42,6 +42,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/test.play.rkh.se.xml b/swamid-2.0/test.play.rkh.se.xml
index db242530..eb9e737f 100644
--- a/swamid-2.0/test.play.rkh.se.xml
+++ b/swamid-2.0/test.play.rkh.se.xml
@@ -42,6 +42,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/testplay.hhs.se.xml b/swamid-2.0/testplay.hhs.se.xml
index cd9559c4..6bb13d6f 100644
--- a/swamid-2.0/testplay.hhs.se.xml
+++ b/swamid-2.0/testplay.hhs.se.xml
@@ -42,6 +42,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml b/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml
index 07028847..e349bc8e 100644
--- a/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml
+++ b/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml
@@ -82,11 +82,11 @@ rGd2vkc4pVut0uwvGCCB44WTILL2gw==
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Authentication Support</md:GivenName>
-    <md:EmailAddress>TechnologyTransferAlliance@gmail.com</md:EmailAddress>
+    <md:EmailAddress>mailto:TechnologyTransferAlliance@gmail.com</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Technology Transfer Alliance</md:GivenName>
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>TechnologyTransferAlliance@gmail.com</md:EmailAddress>
+    <md:EmailAddress>mailto:TechnologyTransferAlliance@gmail.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ubas.lu.se-shibboleth.xml b/swamid-2.0/ubas.lu.se-shibboleth.xml
index a5d91c79..26ae4311 100644
--- a/swamid-2.0/ubas.lu.se-shibboleth.xml
+++ b/swamid-2.0/ubas.lu.se-shibboleth.xml
@@ -86,6 +86,6 @@ u21VH/EFiu9zEqiF00OIOqKPItb7pgRaWF9pf1OyAmh8t9I2FjTvUG42nLMJr62+
   <md:ContactPerson contactType="technical">
     <md:GivenName>Martin</md:GivenName>
     <md:SurName>Åhfeldt</md:SurName>
-    <md:EmailAddress>martin.ahfeldt@lu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:martin.ahfeldt@lu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ugit.se-sp.xml b/swamid-2.0/ugit.se-sp.xml
index 4146e2f6..8937aa43 100644
--- a/swamid-2.0/ugit.se-sp.xml
+++ b/swamid-2.0/ugit.se-sp.xml
@@ -71,6 +71,6 @@
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>UGIT</md:Company>
-    <md:EmailAddress>info@ugit.se</md:EmailAddress>
+    <md:EmailAddress>mailto:info@ugit.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml
index ba75f112..7acc107e 100644
--- a/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml
+++ b/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml
@@ -19,6 +19,6 @@
     <Company>UMDAC</Company>
     <GivenName>Tommy</GivenName>
     <SurName>Larsson</SurName>
-    <EmailAddress>tommy.larsson@umdac.umu.se</EmailAddress>
+    <EmailAddress>mailto:tommy.larsson@umdac.umu.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/uppsalaunilib.slack.com.xml b/swamid-2.0/uppsalaunilib.slack.com.xml
index 137dfc7a..d9914f56 100644
--- a/swamid-2.0/uppsalaunilib.slack.com.xml
+++ b/swamid-2.0/uppsalaunilib.slack.com.xml
@@ -69,7 +69,7 @@ IjNii+vPMK6Z6LJn3urNNSdT5brUXe3AqgPh9Hg9I5BTNm4eM5PlWq3KpiBq64oN
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Fredrik Lysen</md:GivenName>
-    <md:EmailAddress>fredrik.lysen@ub.uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:fredrik.lysen@ub.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>IT</md:GivenName>
diff --git a/swamid-2.0/verify.studentbeans.com-shibboleth.xml b/swamid-2.0/verify.studentbeans.com-shibboleth.xml
index 0b3db007..f63a5331 100644
--- a/swamid-2.0/verify.studentbeans.com-shibboleth.xml
+++ b/swamid-2.0/verify.studentbeans.com-shibboleth.xml
@@ -98,6 +98,6 @@ UKG+a99pFdmiJhaVmr6ppycpR94IcDJb+8Px5A==
   <md:ContactPerson contactType="technical">
     <md:GivenName>William</md:GivenName>
     <md:SurName>Harris</md:SurName>
-    <md:EmailAddress>william@thebeansgroup.com</md:EmailAddress>
+    <md:EmailAddress>mailto:william@thebeansgroup.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/webkonto.student.hig.se-shibboleth.xml b/swamid-2.0/webkonto.student.hig.se-shibboleth.xml
index 25b67246..d0d94eb8 100644
--- a/swamid-2.0/webkonto.student.hig.se-shibboleth.xml
+++ b/swamid-2.0/webkonto.student.hig.se-shibboleth.xml
@@ -71,7 +71,7 @@ mj3ToMT9Iz7u97ghHaP7FQ==
   <md:ContactPerson contactType="support">
     <md:Company>University of Gävle</md:Company>
     <md:SurName>ITsupport</md:SurName>
-    <md:EmailAddress>itsupport@hig.se</md:EmailAddress>
+    <md:EmailAddress>mailto:itsupport@hig.se</md:EmailAddress>
     <md:TelephoneNumber>+46 26 648880</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/weblogon.ltu.se-shibboleth.xml b/swamid-2.0/weblogon.ltu.se-shibboleth.xml
index 79ed938d..f437f9c1 100644
--- a/swamid-2.0/weblogon.ltu.se-shibboleth.xml
+++ b/swamid-2.0/weblogon.ltu.se-shibboleth.xml
@@ -96,7 +96,7 @@ JQ==
   <md:ContactPerson contactType="technical">
     <md:Company>Luleå University of Technology</md:Company>
     <md:SurName>IT Service/Infrastructure</md:SurName>
-    <md:EmailAddress>its-idp@list.ltu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 920 491 664</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
diff --git a/swamid-2.0/webwork.math.su.se-shibboleth.xml b/swamid-2.0/webwork.math.su.se-shibboleth.xml
index 97aed054..9ea9751f 100644
--- a/swamid-2.0/webwork.math.su.se-shibboleth.xml
+++ b/swamid-2.0/webwork.math.su.se-shibboleth.xml
@@ -44,6 +44,6 @@ x4wDuJ8mbDVyyw==</ds:X509Certificate>
     <Company>Stockholm university</Company>
     <GivenName>Tomas</GivenName>
     <SurName>Ericsson</SurName>
-    <EmailAddress>te@math.su.se</EmailAddress>
+    <EmailAddress>mailto:te@math.su.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/webwork2.math.su.se-shibboleth.xml b/swamid-2.0/webwork2.math.su.se-shibboleth.xml
index cbdb102d..f9b72189 100644
--- a/swamid-2.0/webwork2.math.su.se-shibboleth.xml
+++ b/swamid-2.0/webwork2.math.su.se-shibboleth.xml
@@ -44,6 +44,6 @@ x4wDuJ8mbDVyyw==</ds:X509Certificate>
     <Company>Stockholm university</Company>
     <GivenName>Tomas</GivenName>
     <SurName>Ericsson</SurName>
-    <EmailAddress>te@math.su.se</EmailAddress>
+    <EmailAddress>mailto:te@math.su.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml b/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml
index bc406b7b..85fde83d 100644
--- a/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml
+++ b/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml
@@ -53,10 +53,10 @@ EYEYIwfyu/uReqojWsIHxQ==
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Teknisk webmaster</md:GivenName>
-    <md:EmailAddress>techweb@it.liu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:techweb@it.liu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Teknisk webmaster</md:GivenName>
-    <md:EmailAddress>techweb@it.liu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:techweb@it.liu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-1.xml b/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-1.xml
index 17aadd9d..b793cc60 100644
--- a/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-1.xml
+++ b/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-1.xml
@@ -126,9 +126,9 @@ BZ3nmbrlzGnKqIX5ScicLNLtdVyxUJXoAA==</ds:X509Certificate>
     <OrganizationURL xml:lang="en">http://itslearning.com</OrganizationURL>
   </Organization>
   <ContactPerson xml:lang="en" contactType="technical">
-    <EmailAddress>support@itslearning.com</EmailAddress>
+    <EmailAddress>mailto:support@itslearning.com</EmailAddress>
   </ContactPerson>
   <ContactPerson xml:lang="en" contactType="support">
-    <EmailAddress>support@itslearning.com</EmailAddress>
+    <EmailAddress>mailto:support@itslearning.com</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml b/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml
index 187b5a47..70c08c9c 100644
--- a/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml
@@ -76,19 +76,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.mit-integration.ladok.se-gui-sp.xml b/swamid-2.0/www.mit-integration.ladok.se-gui-sp.xml
index ec05287f..13a7b955 100644
--- a/swamid-2.0/www.mit-integration.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit-integration.ladok.se-gui-sp.xml
@@ -76,19 +76,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.mit.ladok.se-gui-sp.xml b/swamid-2.0/www.mit.ladok.se-gui-sp.xml
index 82229028..6fbefca9 100644
--- a/swamid-2.0/www.mit.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit.ladok.se-gui-sp.xml
@@ -76,19 +76,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.start.ladok.se-gui-sp.xml b/swamid-2.0/www.start.ladok.se-gui-sp.xml
index 085297c6..67449d43 100644
--- a/swamid-2.0/www.start.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.start.ladok.se-gui-sp.xml
@@ -76,19 +76,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.student.ladok.se-student-sp.xml b/swamid-2.0/www.student.ladok.se-student-sp.xml
index ca1ad6be..2be2d851 100644
--- a/swamid-2.0/www.student.ladok.se-student-sp.xml
+++ b/swamid-2.0/www.student.ladok.se-student-sp.xml
@@ -77,19 +77,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.sub.su.se.xml b/swamid-2.0/www.sub.su.se.xml
index da8b32e0..e33c06c9 100644
--- a/swamid-2.0/www.sub.su.se.xml
+++ b/swamid-2.0/www.sub.su.se.xml
@@ -19,6 +19,6 @@
     <Company>Stockholm university</Company>
     <GivenName>Conny</GivenName>
     <SurName>Richardson</SurName>
-    <EmailAddress>conny.richardson@sub.su.se</EmailAddress>
+    <EmailAddress>mailto:conny.richardson@sub.su.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/www.test.ladok.se-gui-sp.xml b/swamid-2.0/www.test.ladok.se-gui-sp.xml
index 28291213..c5b5f7b8 100644
--- a/swamid-2.0/www.test.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.test.ladok.se-gui-sp.xml
@@ -76,19 +76,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.utb1.ladok.se-gui-sp.xml b/swamid-2.0/www.utb1.ladok.se-gui-sp.xml
index 3ba20172..5eb70f5e 100644
--- a/swamid-2.0/www.utb1.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.utb1.ladok.se-gui-sp.xml
@@ -76,19 +76,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.utb2.ladok.se-gui-sp.xml b/swamid-2.0/www.utb2.ladok.se-gui-sp.xml
index 4ad85b88..61efa7d9 100644
--- a/swamid-2.0/www.utb2.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.utb2.ladok.se-gui-sp.xml
@@ -76,19 +76,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.utb3.ladok.se-gui-sp.xml b/swamid-2.0/www.utb3.ladok.se-gui-sp.xml
index 619f362c..41d04a9b 100644
--- a/swamid-2.0/www.utb3.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.utb3.ladok.se-gui-sp.xml
@@ -76,19 +76,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.utbildning.ladok.se-gui-sp.xml b/swamid-2.0/www.utbildning.ladok.se-gui-sp.xml
index acc65461..38493615 100644
--- a/swamid-2.0/www.utbildning.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.utbildning.ladok.se-gui-sp.xml
@@ -76,19 +76,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml b/swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml
index 389be8bb..0c2d7c18 100644
--- a/swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml
@@ -76,19 +76,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.verifiering2.ladok.se-gui-sp.xml b/swamid-2.0/www.verifiering2.ladok.se-gui-sp.xml
index bd0b071d..10b8d855 100644
--- a/swamid-2.0/www.verifiering2.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.verifiering2.ladok.se-gui-sp.xml
@@ -76,19 +76,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml b/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml
index 19e3aaf4..5e320ca4 100644
--- a/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml
@@ -76,19 +76,19 @@
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Simon Johansson</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www3.genuinetext.com-shibboleth.xml b/swamid-2.0/www3.genuinetext.com-shibboleth.xml
index d8f5e1fe..dc14540e 100644
--- a/swamid-2.0/www3.genuinetext.com-shibboleth.xml
+++ b/swamid-2.0/www3.genuinetext.com-shibboleth.xml
@@ -37,6 +37,6 @@ v6nJ+bzAScGjfHk=</ds:X509Certificate>
     <Company>Knownet AB</Company>
     <GivenName>Richard</GivenName>
     <SurName>Bäckman</SurName>
-    <EmailAddress>rickard@knonet.se</EmailAddress>
+    <EmailAddress>mailto:rickard@knonet.se</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml
index 0e05f8a1..7460409b 100644
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml
+++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml
@@ -73,6 +73,6 @@ zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
   <ns0:ContactPerson contactType="technical">
     <ns0:GivenName>Roland</ns0:GivenName>
     <ns0:SurName>Hedberg</ns0:SurName>
-    <ns0:EmailAddress>dirg@its.umu.se</ns0:EmailAddress>
+    <ns0:EmailAddress>mailto:dirg@its.umu.se</ns0:EmailAddress>
   </ns0:ContactPerson>
 </ns0:EntityDescriptor>
diff --git a/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml b/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml
index 952b04bc..a73a858b 100644
--- a/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml
+++ b/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml
@@ -25,16 +25,16 @@
   </Organization>
   <ContactPerson contactType="support">
     <SurName>CrossFire Helpdesk</SurName>
-    <EmailAddress>crossfire@mimas.ac.uk</EmailAddress>
+    <EmailAddress>mailto:crossfire@mimas.ac.uk</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <GivenName>david</GivenName>
     <SurName>Chaplin</SurName>
-    <EmailAddress>david.chaplin@manchester.ac.uk</EmailAddress>
+    <EmailAddress>mailto:david.chaplin@manchester.ac.uk</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="administrative">
     <GivenName>Ross</GivenName>
     <SurName>Macintyre</SurName>
-    <EmailAddress>Ross.MacIntyre@manchester.ac.uk</EmailAddress>
+    <EmailAddress>mailto:Ross.MacIntyre@manchester.ac.uk</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>