diff --git a/frontend-react/src/components/usersearch/UserSearchPage.tsx b/frontend-react/src/components/usersearch/UserSearchPage.tsx
index ff4b95027..6a5cff43b 100644
--- a/frontend-react/src/components/usersearch/UserSearchPage.tsx
+++ b/frontend-react/src/components/usersearch/UserSearchPage.tsx
@@ -26,25 +26,28 @@ const UserSearchPage: React.FC<RouteComponentProps> = () => {
   if (error) return <Error errorMessage={error.message} />
   if (loading) return <Loading />
 
-  const usersFiltered = data!.users.filter((user) => {
-    const filterLower = filter.toLowerCase()
-    if (user.discord_id.includes(filterLower)) return true
+  const usersFiltered =
+    filter === ""
+      ? data!.users
+      : data!.users.filter((user) => {
+          const filterLower = filter.toLowerCase()
+          if (user.discord_id.includes(filterLower)) return true
 
-    if (
-      `${user.username}#${user.discriminator}`
-        .toLowerCase()
-        .includes(filterLower)
-    )
-      return true
+          if (
+            `${user.username}#${user.discriminator}`
+              .toLowerCase()
+              .includes(filterLower)
+          )
+            return true
 
-    if (
-      user.twitter_name &&
-      user.twitter_name.toLowerCase().includes(filterLower)
-    )
-      return true
+          if (
+            user.twitter_name &&
+            user.twitter_name.toLowerCase().includes(filterLower)
+          )
+            return true
 
-    return false
-  })
+          return false
+        })
 
   const usersSliced = usersFiltered.slice(
     20 * (currentPage - 1),
diff --git a/index.js b/index.js
index ba8312c96..437db0b3f 100644
--- a/index.js
+++ b/index.js
@@ -30,7 +30,7 @@ passport.use(
       callbackURL,
       scope: ["identify", "connections"],
     },
-    async function (accessToken, refreshToken, profile, cb) {
+    function (accessToken, refreshToken, profile, cb) {
       const userToSave = {
         username: profile.username,
         discriminator: profile.discriminator,
@@ -48,12 +48,7 @@ passport.use(
         }
       }
 
-      await Player.updateOne(
-        { discord_id: userToSave.discord_id },
-        { $set: { twitter: userToSave.twitter_name } }
-      )
-
-      await User.updateOne(
+      User.updateOne(
         { discord_id: userToSave.discord_id },
         userToSave,
         { upsert: true },