diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx
index 5aa272cbe..183d26afc 100644
--- a/src/views/credits/credits.jsx
+++ b/src/views/credits/credits.jsx
@@ -32,12 +32,20 @@ const Credits = () => (
                             key={`person-${index}`}
                         >
                             <div>
-                                <a href={`https://scratch.mit.edu/users/${person.userName}/`}>
+                                {person.userName ? (
+                                    <a href={`https://scratch.mit.edu/users/${person.userName}/`}>
+                                        <Avatar
+                                            alt=""
+                                            src={`https://cdn.scratch.mit.edu/get_image/user/${person.userId || 'default'}_80x80.png`}
+                                        />
+                                    </a>
+                                ) : (
+                                    /* if userName is not given, there's no chance userId is given */
                                     <Avatar
                                         alt=""
-                                        src={`https://cdn.scratch.mit.edu/get_image/user/${person.userId || 'default'}_80x80.png`}
+                                        src={`https://cdn.scratch.mit.edu/get_image/user/default_80x80.png`}
                                     />
-                                </a>
+                                )}
                             </div>
                             <span className="avatar-text">
                                 {person.name}
@@ -145,7 +153,8 @@ const Credits = () => (
                     Christina Huang, Tony Hwang, Abdulrahman Idlbi, Randy Jou, Lily Kim,
                     Tauntaun Kim, Saskia Leggett, Tim Mickel, Amon Millner, Ricarose Roque,
                     Andrea Saxman, Jay Silver, Tammy Stern, Lis Sylvan, Hanako Tjia, Claudia
-                    Urrea, Oren Zuckerman.
+                    Urrea, Oren Zuckerman, Tina Quach, My Nguyen, Lisa O&apos;Brien, Joel Gritter,
+                    Linda Fernsel, Ellen Daoust, Julia Zimmerman.
                 </p>
                 <p>
                     <FormattedMessage id="credits.partnersBody" />
diff --git a/src/views/credits/people.json b/src/views/credits/people.json
index 986b4990c..30ca17e28 100644
--- a/src/views/credits/people.json
+++ b/src/views/credits/people.json
@@ -39,11 +39,6 @@
         "userId": 27383273,
         "name": "Karishma Chadha"
     },
-    {
-        "userName": "SunnyDay4aBlueJay",
-        "userId": 24164779,
-        "name": "Ellen Daoust"
-    },
     {
         "userName": "shruti",
         "userId": 3714374,
@@ -54,11 +49,6 @@
         "userId": 900283,
         "name": "Champika Fernando"
     },
-    {
-        "userName": "LiFaytheGoblin",
-        "userId": 1048810,
-        "name": "Linda Fernsel"
-    },
     {
         "userName": "dietbacon",
         "userId": 24137617,
@@ -84,11 +74,6 @@
         "userId": 49156,
         "name": "Mark Goff"
     },
-    {
-        "userName": "GulpTea",
-        "userId": 26249744,
-        "name": "Joel Gritter"
-    },
     {
         "userName": "codubee",
         "userId": 10866958,
@@ -104,11 +89,6 @@
         "userId": 22183577,
         "name": "Sean Hickey"
     },
-    {
-        "userName": "theladynico",
-        "userId": 35550237,
-        "name": "Nicole Hughes"
-    },
     {
         "userName": "sgcc_",
         "userId": 21986973,
@@ -134,16 +114,6 @@
         "userId": 24838781,
         "name": "Marian Muthui"
     },
-    {
-        "userName": "me_win",
-        "userId": 7664502,
-        "name": "My Nguyen"
-    },
-    {
-        "userName": "lob12",
-        "userId": 2860339,
-        "name": "Lisa O'Brien"
-    },
     {
         "userName": "",
         "userId": "",
@@ -164,11 +134,6 @@
         "userId": 2286560,
         "name": "Carmelo Presicce"
     },
-    {
-        "userName": "quacht",
-        "userId": 25500116,
-        "name": "Tina Quach"
-    },
     {
         "userName": "mres",
         "userId": 167,
@@ -235,8 +200,33 @@
         "name": "Kathy Wu"
     },
     {
-        "userName": "stymphalianbirb",
-        "userId": 2796185,
-        "name": "Julia Zimmerman"
+        "userName": "amylaser",
+        "userId": 17462181,
+        "name": "Amy Lee"
+    },
+    {
+        "userName": "algorithmar",
+        "userId": 43013126,
+        "name": "Maren Vernon"
+    },
+    {
+        "userName": "bluecrazie",
+        "userId": 50257624,
+        "name": "JT Galla"
+    },
+    {
+        "userName": "Za-Chary",
+        "userId": 974363,
+        "name": "Zachary Deiman"
+    },
+    {
+        "userName": "Mos20",
+        "userId": 52545208,
+        "name": "Joan Fusco"
+    },
+    {
+        "userName": "pixelmoth",
+        "userId": 2408962,
+        "name": "Jacy Edelman"
     }
 ]