diff --git a/xep-0286.xml b/xep-0286.xml
index bfd4cbd8..70ffe114 100644
--- a/xep-0286.xml
+++ b/xep-0286.xml
@@ -26,12 +26,7 @@
     <supersedes/>
     <supersededby/>
     <shortname>NOT_YET_ASSIGNED</shortname>
-    <author>
-      <firstname>Dave</firstname>
-      <surname>Cridland</surname>
-      <email>dave.cridland@isode.com</email>
-      <jid>dave.cridland@isode.com</jid>
-    </author>
+    &dcridland;
     &sam;
     <revision>
       <version>0.4.1</version>
diff --git a/xep-0376.xml b/xep-0376.xml
index 212ff5e3..743514ef 100644
--- a/xep-0376.xml
+++ b/xep-0376.xml
@@ -21,12 +21,7 @@
   <supersedes/>
   <supersededby/>
   <shortname>pam</shortname>
-  <author>
-    <firstname>Dave</firstname>
-    <surname>Cridland</surname>
-    <email>dave.cridland@surevine.com</email>
-    <jid>dave.cridland@surevine.com</jid>
-  </author>
+  &dcridland;
   <revision>
     <version>0.2</version>
     <date>2017-09-11</date>