diff --git a/build_tools/generate_authors_table.py b/build_tools/generate_authors_table.py
index 4e341cc7d323f..c2f01b8ca41e4 100644
--- a/build_tools/generate_authors_table.py
+++ b/build_tools/generate_authors_table.py
@@ -47,9 +47,7 @@ def get_contributors():
     # keep only the logins
     logins = [c['login'] for c in members]
     # add missing contributors with GitHub accounts
-    logins.extend(['jarrodmillman', 'thouis'])
-    # add missing contributors without GitHub accounts
-    logins.extend(['Angel Soler Gollonet'])
+    logins.extend(['jarrodmillman'])
     # remove duplicate
     logins = set(logins)
 
diff --git a/doc/about.rst b/doc/about.rst
index b8f2da844b487..4d0da9d42ad9b 100644
--- a/doc/about.rst
+++ b/doc/about.rst
@@ -35,6 +35,7 @@ Emeritus Core Developers
 ------------------------
 The following people have been active contributors in the past, but are no longer active in the project
 
+- Angel Soler Gollonet
 - Alexander Fabisch
 - Alexandre Passos
 - Chris Gorgolewski
@@ -46,6 +47,7 @@ The following people have been active contributors in the past, but are no longe
 - Raghav Rajagopalan
 - Robert Layton
 - Ron Weiss
+- Shiqiao Du
 - Thouis (Ray) Jones
 - Vincent Dubourg
 - Vincent Michel
diff --git a/doc/authors.rst b/doc/authors.rst
index 120f567a74367..56c4fe7a14aa4 100644
--- a/doc/authors.rst
+++ b/doc/authors.rst
@@ -25,10 +25,6 @@
     <p>Noel Dawe</p>
     </td>
     <td>
-    <a href='https://github.com/lucidfrontier45'><img src='https://avatars2.githubusercontent.com/u/655305?v=4' class='avatar' /></a> <br />
-    <p>Shiqiao Du</p>
-    </td>
-    <td>
     <a href='https://github.com/duchesnay'><img src='https://avatars1.githubusercontent.com/u/344402?v=4' class='avatar' /></a> <br />
     <p>Edouard Duchesnay</p>
     </td>
@@ -36,21 +32,17 @@
     <a href='https://github.com/lesteve'><img src='https://avatars1.githubusercontent.com/u/1680079?v=4' class='avatar' /></a> <br />
     <p>Loïc Estève</p>
     </td>
-    </tr>
-    <tr>
     <td>
     <a href='https://github.com/thomasjpfan'><img src='https://avatars2.githubusercontent.com/u/5402633?v=4' class='avatar' /></a> <br />
     <p>Thomas J Fan</p>
     </td>
+    </tr>
+    <tr>
     <td>
     <a href='https://github.com/satra'><img src='https://avatars2.githubusercontent.com/u/184063?v=4' class='avatar' /></a> <br />
     <p>Satrajit Ghosh</p>
     </td>
     <td>
-    <a href=''><img src='https://avatars2.githubusercontent.com/u/365630?v=4' class='avatar' /></a> <br />
-    <p>Angel Soler Gollonet</p>
-    </td>
-    <td>
     <a href='https://github.com/agramfort'><img src='https://avatars2.githubusercontent.com/u/161052?v=4' class='avatar' /></a> <br />
     <p>Alexandre Gramfort</p>
     </td>
@@ -66,8 +58,6 @@
     <a href='https://github.com/yarikoptic'><img src='https://avatars3.githubusercontent.com/u/39889?v=4' class='avatar' /></a> <br />
     <p>Yaroslav Halchenko</p>
     </td>
-    </tr>
-    <tr>
     <td>
     <a href='https://github.com/NicolasHug'><img src='https://avatars2.githubusercontent.com/u/1190450?v=4' class='avatar' /></a> <br />
     <p>Nicolas Hug</p>
@@ -76,15 +66,13 @@
     <a href='https://github.com/adrinjalali'><img src='https://avatars3.githubusercontent.com/u/1663864?v=4' class='avatar' /></a> <br />
     <p>Adrin Jalali</p>
     </td>
+    </tr>
+    <tr>
     <td>
     <a href='https://github.com/arjoly'><img src='https://avatars0.githubusercontent.com/u/1274722?v=4' class='avatar' /></a> <br />
     <p>Arnaud Joly</p>
     </td>
     <td>
-    <a href='https://github.com/thouis'><img src='https://avatars1.githubusercontent.com/u/473043?v=4' class='avatar' /></a> <br />
-    <p>Thouis (Ray) Jones</p>
-    </td>
-    <td>
     <a href='https://github.com/MechCoder'><img src='https://avatars3.githubusercontent.com/u/1867024?v=4' class='avatar' /></a> <br />
     <p>Manoj Kumar</p>
     </td>
@@ -96,8 +84,6 @@
     <a href='https://github.com/weilinear'><img src='https://avatars0.githubusercontent.com/u/2232328?v=4' class='avatar' /></a> <br />
     <p>Wei Li</p>
     </td>
-    </tr>
-    <tr>
     <td>
     <a href='https://github.com/paolo-losi'><img src='https://avatars1.githubusercontent.com/u/264906?v=4' class='avatar' /></a> <br />
     <p>Paolo Losi</p>
@@ -110,6 +96,8 @@
     <a href='https://github.com/jmetzen'><img src='https://avatars1.githubusercontent.com/u/1116263?v=4' class='avatar' /></a> <br />
     <p>Jan Hendrik Metzen</p>
     </td>
+    </tr>
+    <tr>
     <td>
     <a href='https://github.com/jarrodmillman'><img src='https://avatars1.githubusercontent.com/u/123428?v=4' class='avatar' /></a> <br />
     <p>Jarrod Millman</p>
@@ -126,8 +114,6 @@
     <a href='https://github.com/jnothman'><img src='https://avatars2.githubusercontent.com/u/78827?v=4' class='avatar' /></a> <br />
     <p>Joel Nothman</p>
     </td>
-    </tr>
-    <tr>
     <td>
     <a href='https://github.com/fabianp'><img src='https://avatars3.githubusercontent.com/u/277639?v=4' class='avatar' /></a> <br />
     <p>Fabian Pedregosa</p>
@@ -140,6 +126,8 @@
     <a href='https://github.com/qinhanmin2014'><img src='https://avatars2.githubusercontent.com/u/12003569?v=4' class='avatar' /></a> <br />
     <p>Hanmin Qin</p>
     </td>
+    </tr>
+    <tr>
     <td>
     <a href='https://github.com/jmschrei'><img src='https://avatars2.githubusercontent.com/u/3916816?v=4' class='avatar' /></a> <br />
     <p>Jacob Schreiber</p>
@@ -156,8 +144,6 @@
     <a href='https://github.com/NelleV'><img src='https://avatars0.githubusercontent.com/u/184798?v=4' class='avatar' /></a> <br />
     <p>Nelle Varoquaux</p>
     </td>
-    </tr>
-    <tr>
     <td>
     <a href='https://github.com/GaelVaroquaux'><img src='https://avatars3.githubusercontent.com/u/208217?v=4' class='avatar' /></a> <br />
     <p>Gael Varoquaux</p>