diff --git a/xep-0399.xml b/xep-0399.xml
index 94171e56..28c32f46 100644
--- a/xep-0399.xml
+++ b/xep-0399.xml
@@ -22,12 +22,7 @@
   <shortname>client-key</shortname>
   <registry/>
   <discuss>standards</discuss>
-  <author>
-    <firstname>Dave</firstname>
-    <surname>Cridland</surname>
-    <email>dave.cridland@surevine.com</email>
-    <jid>dave.cridland@surevine.com</jid>
-  </author>
+  &dcridland;
   <revision>
     <version>0.1.0</version>
     <date>2018-01-25</date>
diff --git a/xep-0400.xml b/xep-0400.xml
index 79469ab1..8e6e7b68 100644
--- a/xep-0400.xml
+++ b/xep-0400.xml
@@ -23,12 +23,7 @@
   <shortname>mfa</shortname>
   <registry/>
   <discuss>standards</discuss>
-  <author>
-    <firstname>Dave</firstname>
-    <surname>Cridland</surname>
-    <email>dave.cridland@surevine.com</email>
-    <jid>dave.cridland@surevine.com</jid>
-  </author>
+  &dcridland;
   <revision>
     <version>0.1.0</version>
     <date>2018-01-25</date>
diff --git a/xep-0402.xml b/xep-0402.xml
index 124bf81f..55a0c0d6 100644
--- a/xep-0402.xml
+++ b/xep-0402.xml
@@ -23,12 +23,7 @@
         <shortname>bookmarks2</shortname>
         <registry/>
         <discuss>standards</discuss>
-        <author>
-            <firstname>Dave</firstname>
-            <surname>Cridland</surname>
-            <email>dave.cridland@surevine.com</email>
-            <jid>dave.cridland@surevine.com</jid>
-        </author>
+        &dcridland;
         <author>
             <firstname>Jan-Carel</firstname>
             <surname>Brand</surname>