diff --git a/src/app/website/index/Teams.svelte b/src/app/website/index/Teams.svelte
index c0e714c..078943d 100644
--- a/src/app/website/index/Teams.svelte
+++ b/src/app/website/index/Teams.svelte
@@ -12,25 +12,17 @@
 
   const entries = teams.map((team) => ({
     ...team,
-    memberOne:
-      team.memberOne.id != null
-        ? {
-            ...team.memberOne,
-            dead: deaths.findIndex((d) => d.deadUserId === team.memberOne.id) !== -1
-          }
-        : undefined,
-    memberTwo:
-      team.memberTwo.id != null
-        ? {
-            ...team.memberTwo,
-            dead: deaths.findIndex((d) => d.deadUserId === team.memberTwo.id) !== -1
-          }
-        : undefined,
+    memberOne: Object.assign(team.memberOne, {
+      dead: team.memberOne.id != null ? deaths.findIndex((d) => d.deadUserId === team.memberOne.id) !== -1 : null,
+    }),
+    memberTwo: Object.assign(team.memberTwo, {
+      dead: team.memberTwo.id != null ? deaths.findIndex((d) => d.deadUserId === team.memberTwo.id) !== -1 : null,
+    }),
     kills: deaths.filter((d) => d.killerUserId === team.memberOne.id || d.killerUserId === team.memberTwo.id).length
   }));
   entries.sort((a, b) => {
-    const aAllowed = !!a.memberOne && !!a.memberTwo && !(a.memberOne.dead && a.memberTwo.dead);
-    const bAllowed = !!b.memberOne && !!b.memberTwo && !(b.memberOne.dead && b.memberTwo.dead);
+    const aAllowed = !!a.memberOne.id && !!a.memberTwo.id && !(a.memberOne.dead && a.memberTwo.dead);
+    const bAllowed = !!b.memberOne.id && !!b.memberTwo.id && !(b.memberOne.dead && b.memberTwo.dead);
     if (!aAllowed && !bAllowed) {
       return 0;
     } else if (!aAllowed || !bAllowed) {
@@ -61,37 +53,37 @@
                 {team.name}
               </h3>
             </div>
-            {#if !team.memberOne || !team.memberTwo}
+            {#if !team.memberOne.id || !team.memberTwo.id}
               <span>Team unvollständig</span>
             {/if}
           </td>
           <td class="max-w-9 overflow-ellipsis">
-            {#if team.memberOne}
-              <div class="flex items-center gap-x-2">
+            <div class="flex items-center gap-x-2">
+              {#if team.memberOne.id != null}
                 <img
                   class="h-4 pixelated"
                   src={team.memberOne.dead ? Skeleton.src : `https://mc-heads.net/head/${team.memberOne.username}/8`}
                   alt="head"
                 />
-                <span class="text-xs sm:text-md" class:line-through={team.memberOne.dead}
-                  >{team.memberOne.username}</span
-                >
-              </div>
-            {/if}
+              {/if}
+              <span class="text-xs sm:text-md" class:line-through={team.memberOne.dead} class:text-gray-500={team.memberOne.id == null}
+                >{team.memberOne.username}</span
+              >
+            </div>
           </td>
           <td>
-            {#if team.memberTwo}
-              <div class="flex items-center gap-x-2">
+            <div class="flex items-center gap-x-2">
+              {#if team.memberTwo.id != null}
                 <img
                   class="h-4 pixelated"
                   src={team.memberTwo.dead ? Skeleton.src : `https://mc-heads.net/head/${team.memberTwo.username}/8`}
                   alt="head"
                 />
-                <span class="text-xs sm:text-md" class:line-through={team.memberTwo.dead}
-                  >{team.memberTwo.username}</span
-                >
-              </div>
-            {/if}
+              {/if}
+              <span class="text-xs sm:text-md" class:line-through={team.memberTwo.dead} class:text-gray-500={team.memberTwo.id == null}
+                >{team.memberTwo.username}</span
+              >
+            </div>
           </td>
           <td>
             <span class="text-xs sm:text-md">0</span>