diff --git a/.mailmap b/.mailmap
index 5cefacfcf2d4a8..9ee76141ef3af6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -150,8 +150,8 @@ Gabriel de Perthuis <g2p.code@gmail.com>
 Gareth Ellis <gareth.ellis@uk.ibm.com> <gareth@gsellis.com>
 Garwah Lam <garwahlam@gmail.com>
 garygsc <garygsc@gmail.com> <GaryGSC@users.noreply.github.com>
-Geoffrey Booth <GeoffreyBooth@users.noreply.github.com> <webadmin@geoffreybooth.com>
-Geoffrey Booth <webmaster@geoffreybooth.com> <webadmin@geoffreybooth.com>
+Geoffrey Booth <webadmin@geoffreybooth.com> <GeoffreyBooth@users.noreply.github.com>
+Geoffrey Booth <webadmin@geoffreybooth.com> <webmaster@geoffreybooth.com>
 Geoffrey Bugaisky <gbugaisk@gmail.com>
 Gerhard Stöbich <deb2001-github@yahoo.de>
 Gibson Fahnestock <gibfahn@gmail.com> <gib@uk.ibm.com>
diff --git a/AUTHORS b/AUTHORS
index 5ff0195965b9d5..602727b0a389e3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2484,7 +2484,7 @@ Loic <loic.veteau@outlook.fr>
 Denis McDonald <denis.l.mcdonald@gmail.com>
 Arvind Pandey <arvind3157@gmail.com>
 Jagannath Bhat <jagannathbhat1998@gmail.com>
-Geoffrey Booth <webmaster@geoffreybooth.com>
+Geoffrey Booth <webadmin@geoffreybooth.com>
 mritunjaygoutam12 <mritunjaygoutam2204@gmail.com>
 Esteban Sotillo <westixy@gmail.com>
 Jerome Covington <jeromecovington@gmail.com>
@@ -2827,7 +2827,6 @@ Aditya <adityashnkr5@gmail.com>
 Denis Zavershinskiy <zaverden@gmail.com>
 Levhita <levhita@gmail.com>
 claudiahdz <cghr1990@gmail.com>
-Geoffrey Booth <GeoffreyBooth@users.noreply.github.com>
 Javier Ledezma <juls0593@gmail.com>
 Marian Rusnak <4215517+marian-r@users.noreply.github.com>
 Jenia <jeniabrook@gmail.com>