diff --git a/.mailmap b/.mailmap
index b0dd836a95..042a02e380 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,6 +13,8 @@ Chris Bobbe <cbobbe@zulip.com> <csbobbe@gmail.com>
 Greg Price <greg@zulip.com> <gnprice@gmail.com>
 Greg Price <greg@zulip.com> <greg@zulipchat.com>
 Greg Price <greg@zulip.com> <price@mit.edu>
+Jeff Arnold <jbarnold@gmail.com> <jbarnold@humbughq.com>
+Jeff Arnold <jbarnold@gmail.com> <jbarnold@zulip.com>
 Jessica McKellar <jesstess@mit.edu> <jesstess@humbughq.com>
 Jessica McKellar <jesstess@mit.edu> <jesstess@zulip.com>
 Kevin Mehall <km@kevinmehall.net> <kevin@humbughq.com>
@@ -35,8 +37,3 @@ Tim Abbott <tabbott@zulip.com> <tabbott@mit.edu>
 Tim Abbott <tabbott@zulip.com> <tabbott@zulipchat.com>
 Vishnu KS <yo@vishnuks.com> <hackerkid@vishnuks.com>
 Vishnu KS <yo@vishnuks.com> <yo@vishnuks.com>
-
-# Some major contributors of Zulip whose email in commit messages are not associated
-# to any GitHub account. mailmap entry added to group the commits togather so that there
-# are no multiple entries in /team page.
-Jeff Arnold <jbarnold@zulip.com> <jbarnold@humbughq.com>