diff --git a/.mailmap b/.mailmap
index 00c8337aa..7cff0de69 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,10 +13,10 @@
 <shadowninja@minetest.net> <ShadowNinja@users.noreply.github.com>
 Daniel Folkinshteyn <nanotube@users.sourceforge.net> Daniel F <dfolkins@a90.(none)>
 Daniel Folkinshteyn <nanotube@users.sourceforge.net> nanotube <nanotube@users.sf.net>
-James Lu <GLolol@overdrivenetworks.com> <GLolol1@hotmail.com>
-James Lu <GLolol@overdrivenetworks.com> <glolol1@hotmail.com>
-James Lu <GLolol@overdrivenetworks.com> <glolol@overdrive.pw>
-James Lu <GLolol@overdrivenetworks.com> <james@overdrivenetworks.com>
+James Lu <james@overdrivenetworks.com> <GLolol1@hotmail.com>
+James Lu <james@overdrivenetworks.com> <glolol1@hotmail.com>
+James Lu <james@overdrivenetworks.com> <glolol@overdrive.pw>
+James Lu <james@overdrivenetworks.com> <GLolol@overdrivenetworks.com>
 James McCoy <jamessan@users.sourceforge.net>
 Ken Spencer <ken@electrocode.net> Iota Spencer <iota@electrocode.net>
 Mikaela Suomalainen <mikaela.suomalainen@outlook.com> Mika Suomalainen <mika.henrik.mainio@hotmail.com>