diff --git a/src/app/components/Player/PlayerForm/index.tsx b/src/app/components/Player/PlayerForm/index.tsx
index 7c693319..78fd41e8 100644
--- a/src/app/components/Player/PlayerForm/index.tsx
+++ b/src/app/components/Player/PlayerForm/index.tsx
@@ -28,7 +28,9 @@ export const PlayerForm = ({ player }: Props) => {
     motto: player ? player.motto : "",
     emoji: player ? player.emoji : "",
   });
+
   const [emojiSelectorOpen, setEmojiSelectorOpen] = useState<boolean>(false);
+  const [isButtonPressed, setButtonPressed] = useState(false);
 
   const router = useRouter();
 
@@ -51,6 +53,7 @@ export const PlayerForm = ({ player }: Props) => {
   };
 
   const submitNewPlayer = async (newPlayer: NewPlayer) => {
+    setButtonPressed(!isButtonPressed);
     const res = await fetch("/api/player/", {
       method: "POST",
       headers: {
@@ -129,7 +132,7 @@ export const PlayerForm = ({ player }: Props) => {
         </div>
         <TextButton
           buttonType="button"
-          disabled={!isValid}
+          disabled={!isValid || isButtonPressed}
           onClick={submit}
           RightIcon={HiUserAdd}
           text={isUpdate ? "Save changes" : "Create player"}
diff --git a/src/app/components/ui/PlayerSearch/PlayerSearchLink.tsx b/src/app/components/ui/PlayerSearch/PlayerSearchLink.tsx
index 969c03c0..f2fa8d2b 100644
--- a/src/app/components/ui/PlayerSearch/PlayerSearchLink.tsx
+++ b/src/app/components/ui/PlayerSearch/PlayerSearchLink.tsx
@@ -68,7 +68,7 @@ export const PlayerSearchLink = ({ visible, onClick, onBlur }: Props) => {
   return (
     <div className="flex w-full flex-col gap-2">
       <input
-        className="w-full rounded-lg bg-white p-3"
+        className="w-full rounded-lg bg-white p-3 text-black"
         placeholder={"Search for a player"}
         onClick={onClick}
         onKeyDown={handleKeyPress}
diff --git a/src/server/db/players/index.ts b/src/server/db/players/index.ts
index 78140f4b..bed93585 100644
--- a/src/server/db/players/index.ts
+++ b/src/server/db/players/index.ts
@@ -128,23 +128,41 @@ const searchPlayers = async (
   query: string,
   limit?: number,
 ): Promise<PlayerModel[]> => {
-  const colOptions = ["first_name", "last_name", "nickname", "id"];
-  const permutations = permutator(colOptions);
-
-  const options = permutations.map((perm) => {
-    return Sequelize.where(
-      Sequelize.fn("concat", ...perm.map((col) => Sequelize.col(col))),
-      {
-        [Op.iLike]: `%${query.replaceAll(" ", "%")}%`,
-      },
+  try {
+    const colOptions = ["first_name", "last_name", "nickname", "id"];
+    const permutations = permutator(colOptions);
+
+    const queryParts = query.split(" ").filter((part) => part.length > 0);
+
+    const options = await Promise.all(
+      queryParts.map(async (part) => {
+        return await Promise.all(
+          permutations.map(async (perm) => {
+            return Sequelize.where(
+              Sequelize.fn("concat", ...perm.map((col) => Sequelize.col(col))),
+              {
+                [Op.iLike]: `${part}%`,
+              },
+            );
+          }),
+        );
+      }),
     );
-  });
 
-  const players = await PlayerModel.findAll({
-    where: { [Op.or]: options },
-    limit: limit,
-  });
-  return players;
+    const whereClause = {
+      [Op.and]: options.map((opts) => ({ [Op.or]: opts })),
+    };
+
+    const players = await PlayerModel.findAll({
+      where: whereClause,
+      limit: limit,
+    });
+
+    return players;
+  } catch (error) {
+    console.error("Error in searchPlayers:", error);
+    throw error;
+  }
 };
 
 export {