diff --git a/.mailmap b/.mailmap
index e9fc78376263d9..a70c23c9a96d2d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -231,8 +231,8 @@ Kazuyuki Yamada <tasogare.pg@gmail.com>
 Keith M Wesolowski <wesolows@joyent.com> <wesolows@foobazco.org>
 Kelsey Breseman <ifoundthemeaningoflife@gmail.com>
 Ke Ding <dingkework@hotmail.com>
-Khaidi Chu <admin@xcoder.in>
-Khaidi Chu <admin@xcoder.in> <i@2333.moe>
+Khaidi Chu <i@2333.moe>
+Khaidi Chu <i@2333.moe> <admin@xcoder.in>
 Kimberly Wilber <gcr@sneakygcr.net>
 Kimberly Wilber <gcr@sneakygcr.net> <gcr@users.noreply.github.com>
 Kiyoshi Nomo <tokyoincidents.g@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 2c1718f2bdde75..feebd35513f438 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1494,7 +1494,7 @@ Sreepurna Jasti <sreepurna.jasti@gmail.com>
 Rafael Fragoso <rafaelfragosom@gmail.com>
 Andrei Cioromila <andrei.cioromila@gmail.com>
 Frank Lanitz <frank@frank.uvena.de>
-Khaidi Chu <admin@xcoder.in>
+Khaidi Chu <i@2333.moe>
 Akshay Iyer <c.m.akshay.iyer@gmail.com>
 Rick Bullotta <RickBullotta@users.noreply.github.com>
 Rajaram Gaunker <zimbabao@gmail.com>