diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 0fd9b760..cd1e6276 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -3,6 +3,7 @@
     Common beans for this channel.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="
@@ -99,6 +100,21 @@
     </bean>
     
     
+    <!--
+        uk_fix_mailto
+        
+        Adds "mailto:" to md:EmailAddress elements which don't already have it.
+    -->
+    <bean id="uk_fix_mailto" p:id="uk_fix_mailto" class="net.shibboleth.metadata.dom.XSLTransformationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/fix_mailto.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    
     <!--
         check_ukreg
         
diff --git a/mdx/uk/fix_mailto.xsl b/mdx/uk/fix_mailto.xsl
new file mode 100644
index 00000000..b25f1793
--- /dev/null
+++ b/mdx/uk/fix_mailto.xsl
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	fix_mailto.xsl
+
+	Add "mailto:" scheme to e-mail addresses if not already present.
+	
+-->
+<xsl:stylesheet version="1.0"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+
+	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	exclude-result-prefixes="md">
+
+	<!--Force UTF-8 encoding for the output.-->
+	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
+
+	<xsl:template match="md:EmailAddress[not(starts-with(., 'mailto:'))]">
+		<xsl:copy>
+			<xsl:apply-templates select="@*"/>
+			<xsl:text>mailto:</xsl:text>
+			<xsl:value-of select="."/>
+		</xsl:copy>
+	</xsl:template>
+	
+	<!--By default, copy text blocks, comments and attributes unchanged.-->
+	<xsl:template match="text()|comment()|@*">
+		<xsl:copy/>
+	</xsl:template>
+	
+	<!--By default, copy all elements from the input to the output, along with their attributes and contents.-->
+	<xsl:template match="*">
+		<xsl:copy>
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:copy>
+	</xsl:template>
+	
+</xsl:stylesheet>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 72efcfaf..abd9f713 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -40,6 +40,7 @@
             <list>
                 <ref bean="ie_edugate_exportedEntities"/>
                 <ref bean="uk_performFixups"/>
+                <ref bean="uk_fix_mailto"/>
             </list>
         </property>
     </bean>