diff --git a/.mailmap b/.mailmap
index 5bf31747d..e39863420 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,8 +17,11 @@ Julius Jonusas <j.jonusas@gmail.com> jj <unknown>
 Julius Jonusas <j.jonusas@gmail.com> sriubas <j.jonusas@gmail.com>
 Olexandr Konovalov <obk1@st-andrews.ac.uk> Alexander Konovalov <alex-konovalov@users.noreply.github.com>
 Andrea Lee <ahwl1@st-andrews.ac.uk> baydrea <87464855+baydrea@users.noreply.github.com>
-James Mitchell <jdm3@st-and.ac.uk> <james-d-mitchell@users.noreply.github.com>
-James Mitchell <jdm3@st-and.ac.uk> <jdm3@st-andrews.ac.uk>
+James Mitchell <jdm3@st-andrews.ac.uk> <james-d-mitchell@users.noreply.github.com>
+James Mitchell <jdm3@st-andrews.ac.uk> <jdm3@st-andrews.ac.uk>
+James Mitchell <jdm3@st-andrews.ac.uk> James Mitchell <jdm3@st-and.ac.uk>
+James Mitchell <jdm3@st-andrews.ac.uk> James D. <jdm3@st-andrews.ac.uk>
+James Mitchell <jdm3@st-andrews.ac.uk> James Mitchell <james-d-mitchell@users.noreply.github.com>
 Markus Pfeiffer <markus.pfeiffer@morphism.de> Markus Pfeiffer <markus.pfeiffer@st-andrews.ac.uk>
 Markus Pfeiffer <markus.pfeiffer@morphism.de> Markus Pfeiffer <markuspf@users.noreply.github.com>
 Lea Racine <lr217@st-andrews.ac.uk> LRacine <35891709+LRacine@users.noreply.github.com>
diff --git a/PackageInfo.g b/PackageInfo.g
index b72c42eb0..2d1f259a5 100644
--- a/PackageInfo.g
+++ b/PackageInfo.g
@@ -229,7 +229,7 @@ Persons := [
     FirstNames    := "James",
     IsAuthor      := true,
     IsMaintainer  := true,
-    Email         := "jdm3@st-and.ac.uk",
+    Email         := "jdm3@st-andrews.ac.uk",
     WWWHome       := "https://jdbm.me",
     PostalAddress := _STANDREWSMATHS,
     Place         := "St Andrews",