diff --git a/components/tournament/TournamentDetail.vue b/components/tournament/TournamentDetail.vue
index 0b39d30d..a345780c 100644
--- a/components/tournament/TournamentDetail.vue
+++ b/components/tournament/TournamentDetail.vue
@@ -1016,7 +1016,10 @@ function clearTeamEnterDelay(el: Element) {
           <SheetTitle class="text-2xl">
             {{ $t("tournament.join.title") }}
           </SheetTitle>
-          <SheetDescription>
+          <!-- A free agent enters alone, so the lineup minimum is not the
+               sheet's headline any more -- the team half of the form still
+               states it where it applies. -->
+          <SheetDescription v-if="!freeAgentsTabVisible">
             {{
               $t("tournament.join.requirements", {
                 count: tournament.min_players_per_lineup,
@@ -1028,6 +1031,8 @@ function clearTeamEnterDelay(el: Element) {
         <div class="mt-6">
           <TournamentJoinForm
             :tournament="tournament"
+            :registration="tournamentRegistration"
+            :my-free-agent="myFreeAgent"
             @close="joinSheetOpen = false"
           />
         </div>
diff --git a/components/tournament/TournamentEntryGate.vue b/components/tournament/TournamentEntryGate.vue
index 7f44158f..c46b8b83 100644
--- a/components/tournament/TournamentEntryGate.vue
+++ b/components/tournament/TournamentEntryGate.vue
@@ -5,6 +5,7 @@ import { ShieldCheck, ShieldX } from "lucide-vue-next";
 import TournamentChip from "~/components/tournament/TournamentChip.vue";
 import { e_tournament_status_enum } from "~/generated/zeus";
 import { useAuthStore } from "~/stores/AuthStore";
+import { tournamentPlayerElo } from "~/utilities/tournamentElo";
 
 const props = defineProps<{
   tournament: Record<string, any>;
@@ -47,17 +48,12 @@ const roleBlocked = computed(
   () => !!minRole.value && props.registration?.meets_min_role === false,
 );
 
-// get_tournament_player_elo reads the WINGMAN ladder when the lineup minimum is
-// 2 and the Competitive one otherwise, while `players.elo` is only ever the
-// latter. Rather than announce a verdict off the wrong ladder, a 2v2 tournament
-// gets the requirement without the comparison.
-const myElo = computed(() => {
-  if (Number(props.tournament?.min_players_per_lineup) === 2) {
-    return null;
-  }
-  const elo = Number(me.value?.elo);
-  return Number.isFinite(elo) ? elo : null;
-});
+// The verdict has to come off the ladder get_tournament_player_elo gates on --
+// Wingman when the lineup minimum is 2, Competitive otherwise -- or the panel
+// announces a pass the insert trigger is about to refuse.
+const myElo = computed(() =>
+  tournamentPlayerElo(props.tournament, me.value),
+);
 
 const eloBlocked = computed(() => {
   if (myElo.value === null) {
diff --git a/components/tournament/TournamentFreeAgentSignUp.vue b/components/tournament/TournamentFreeAgentSignUp.vue
new file mode 100644
index 00000000..db530d0f
--- /dev/null
+++ b/components/tournament/TournamentFreeAgentSignUp.vue
@@ -0,0 +1,253 @@
+<script lang="ts" setup>
+import { computed } from "vue";
+import { useI18n } from "vue-i18n";
+import { useApolloClient } from "@vue/apollo-composable";
+import { UserPlus, Users } from "lucide-vue-next";
+import { Button } from "~/components/ui/button";
+import PlayerDisplay from "~/components/PlayerDisplay.vue";
+import TournamentChip from "~/components/tournament/TournamentChip.vue";
+import { toast } from "~/components/ui/toast";
+import { e_tournament_status_enum } from "~/generated/zeus";
+import { useAuthStore } from "~/stores/AuthStore";
+import { useMatchmakingStore } from "~/stores/MatchmakingStore";
+import { runTournamentAction } from "~/utilities/tournamentActions";
+
+type Agent = Record<string, any>;
+
+const props = withDefaults(
+  defineProps<{
+    tournament: Record<string, any>;
+    // The viewer's own pool row, if they have one. Passed in rather than looked
+    // up so this renders the same answer as whatever surface hosts it.
+    myEntry?: Agent | null;
+    // Only the "already signed up alone" hint reads the pool, so a caller that
+    // has not subscribed to it can leave it out.
+    pool?: Agent[];
+  }>(),
+  { myEntry: null, pool: () => [] },
+);
+
+const emit = defineEmits<{ joined: [] }>();
+
+const { t } = useI18n();
+const { client } = useApolloClient();
+
+const me = computed(() => useAuthStore().me);
+
+const teamSize = computed(
+  () =>
+    Number(props.tournament?.min_players_per_lineup) ||
+    Number(props.tournament?.max_players_per_lineup) ||
+    0,
+);
+
+// joinTournamentAsFreeAgent requires exactly RegistrationOpen, while the leave
+// rule also allows Setup. Offering Sign up during Setup produces a button that
+// can only ever fail, so the two windows are kept apart.
+const canSignUp = computed(
+  () =>
+    !!me.value &&
+    props.tournament?.status === e_tournament_status_enum.RegistrationOpen &&
+    !props.myEntry,
+);
+
+// The party IS the matchmaking lobby — there is no separate invite to accept,
+// because a captain who can already queue the whole lobby into a live match is
+// making a strictly smaller commitment by entering it in a draft. Read straight
+// off the store that owns lobby state; a second derivation of "who is in my
+// lobby" is how the two answers drift apart.
+const lobbyMembers = computed<Agent[]>(() => {
+  const lobby = useMatchmakingStore().currentLobby as Agent | undefined;
+  // Only accepted members count — a pending invite is not consent, and the API
+  // sizes the party the same way.
+  return ((lobby?.players ?? []) as Agent[]).filter(
+    (member) => member.status === "Accepted",
+  );
+});
+
+const lobbyCaptain = computed(
+  () => lobbyMembers.value.find((member) => member.captain) ?? null,
+);
+
+const isLobbyCaptain = computed(() => {
+  const steamId = String(me.value?.steam_id ?? "");
+  return (
+    !!steamId && String(lobbyCaptain.value?.player?.steam_id ?? "") === steamId
+  );
+});
+
+// A party of more than a full team can never be drafted, so the API refuses the
+// signup outright. Signing up alone is the intended escape hatch. Mirrors
+// tournament_free_agent_party_fits, which passes a format with no lineup size
+// rather than measuring against a zero.
+const lobbyFitsTeam = computed(
+  () => teamSize.value < 1 || lobbyMembers.value.length <= teamSize.value,
+);
+
+const lobbyMembersAlreadyInPool = computed(() => {
+  const steamIds = new Set(
+    props.pool.map((row) => String(row.player?.steam_id)),
+  );
+  return lobbyMembers.value.filter((member) =>
+    steamIds.has(String(member.player?.steam_id)),
+  ).length;
+});
+
+const showLobbySignUp = computed(
+  () => canSignUp.value && lobbyMembers.value.length > 1,
+);
+
+const canSignUpWithLobby = computed(
+  () => showLobbySignUp.value && isLobbyCaptain.value && lobbyFitsTeam.value,
+);
+
+async function joinPool(withParty = false) {
+  const data = await runTournamentAction(
+    client,
+    {
+      joinTournamentAsFreeAgent: [
+        {
+          tournament_id: props.tournament.id,
+          // PRE-CODEGEN ESCAPE HATCH — `with_party` is a new action argument
+          // Zeus has not generated, so it rides the `as any` in
+          // runTournamentAction. Omitted entirely when false: that is
+          // byte-for-byte the old solo signup, which every unmigrated API
+          // still accepts.
+          ...(withParty ? { with_party: true } : {}),
+        },
+        {
+          success: true,
+        },
+      ],
+    },
+    withParty
+      ? t("tournament.free_agents.join_with_lobby_failed")
+      : t("tournament.free_agents.join_failed"),
+  );
+
+  if (!data) {
+    return;
+  }
+
+  toast({ title: t("tournament.free_agents.joined") });
+  emit("joined");
+}
+</script>
+
+<template>
+  <!-- The whole lobby, or nobody: the consequence has to be readable before
+       the click, because there is no confirmation step and no invite for the
+       other members to accept. -->
+  <div
+    v-if="showLobbySignUp"
+    class="rounded-md border border-l-2 border-border border-l-[hsl(var(--tac-amber))] bg-card/45 p-3.5"
+  >
+    <div class="mb-2.5 flex flex-wrap items-center gap-2">
+      <Users class="h-3.5 w-3.5 text-[hsl(var(--tac-amber))]" />
+      <span
+        class="font-mono text-[0.62rem] uppercase tracking-[0.2em] text-[hsl(var(--tac-amber))]"
+      >
+        {{ $t("tournament.free_agents.lobby_title") }}
+      </span>
+      <TournamentChip :tone="lobbyFitsTeam ? 'amber' : 'warn'">
+        {{
+          $t("tournament.free_agents.lobby_size", {
+            count: lobbyMembers.length,
+            size: teamSize,
+          })
+        }}
+      </TournamentChip>
+    </div>
+
+    <div class="mb-2.5 flex flex-wrap items-center gap-x-4 gap-y-1">
+      <PlayerDisplay
+        v-for="member in lobbyMembers"
+        :key="member.player?.steam_id"
+        :player="member.player"
+        size="xs"
+        :linkable="true"
+        :show-elo="false"
+        :show-online="false"
+        :show-role="false"
+      />
+    </div>
+
+    <p class="text-[0.78rem] leading-relaxed text-muted-foreground">
+      {{
+        lobbyFitsTeam
+          ? $t("tournament.free_agents.lobby_hint", {
+              count: lobbyMembers.length,
+              size: teamSize,
+            })
+          : $t("tournament.free_agents.lobby_too_big", {
+              count: lobbyMembers.length,
+              size: teamSize,
+            })
+      }}
+    </p>
+
+    <p
+      v-if="lobbyFitsTeam && !isLobbyCaptain && lobbyCaptain"
+      class="mt-1.5 text-[0.78rem] leading-relaxed text-muted-foreground"
+    >
+      {{
+        $t("tournament.free_agents.lobby_not_captain", {
+          name: lobbyCaptain.player?.name,
+        })
+      }}
+    </p>
+
+    <p
+      v-if="canSignUpWithLobby && lobbyMembersAlreadyInPool > 0"
+      class="mt-1.5 text-[0.78rem] leading-relaxed text-muted-foreground"
+    >
+      {{
+        $t("tournament.free_agents.lobby_already_signed_up", {
+          count: lobbyMembersAlreadyInPool,
+        })
+      }}
+    </p>
+
+    <div class="mt-3 flex flex-wrap items-center gap-2">
+      <Button
+        v-if="canSignUpWithLobby"
+        type="button"
+        size="sm"
+        class="h-8"
+        @click="joinPool(true)"
+      >
+        <Users class="mr-1.5 h-3.5 w-3.5" />
+        {{
+          $t("tournament.free_agents.sign_up_with_lobby", {
+            count: lobbyMembers.length,
+          })
+        }}
+      </Button>
+      <Button
+        :variant="canSignUpWithLobby ? 'outline' : 'default'"
+        type="button"
+        size="sm"
+        class="h-8"
+        @click="joinPool()"
+      >
+        <UserPlus class="mr-1.5 h-3.5 w-3.5" />
+        {{ $t("tournament.free_agents.sign_up_alone") }}
+      </Button>
+    </div>
+  </div>
+
+  <div
+    v-else-if="canSignUp"
+    class="flex flex-wrap items-center justify-between gap-3 rounded-md border border-border bg-card/45 p-3.5"
+  >
+    <p
+      class="min-w-[18ch] flex-1 text-[0.78rem] leading-relaxed text-muted-foreground"
+    >
+      {{ $t("tournament.free_agents.sign_up_hint", { size: teamSize }) }}
+    </p>
+    <Button type="button" size="sm" class="h-8 shrink-0" @click="joinPool()">
+      <UserPlus class="mr-1.5 h-3.5 w-3.5" />
+      {{ $t("tournament.free_agents.sign_up") }}
+    </Button>
+  </div>
+</template>
diff --git a/components/tournament/TournamentFreeAgents.vue b/components/tournament/TournamentFreeAgents.vue
index 583a93be..41fd766e 100644
--- a/components/tournament/TournamentFreeAgents.vue
+++ b/components/tournament/TournamentFreeAgents.vue
@@ -2,7 +2,7 @@
 import { computed, ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { useApolloClient, useSubscription } from "@vue/apollo-composable";
-import { Info, RefreshCw, UserMinus, UserPlus, Users } from "lucide-vue-next";
+import { Info, RefreshCw, UserMinus, Users } from "lucide-vue-next";
 import { Button } from "~/components/ui/button";
 import {
   Empty,
@@ -11,18 +11,24 @@ import {
 } from "~/components/ui/empty";
 import AnimatedFilters from "~/components/common/AnimatedFilters.vue";
 import PlayerDisplay from "~/components/PlayerDisplay.vue";
+import PlayerElo from "~/components/PlayerElo.vue";
 import TournamentChip from "~/components/tournament/TournamentChip.vue";
+import TournamentFreeAgentSignUp from "~/components/tournament/TournamentFreeAgentSignUp.vue";
 import { toast } from "~/components/ui/toast";
 import { $, e_tournament_status_enum } from "~/generated/zeus";
-import { generateMutation, generateSubscription } from "~/graphql/graphqlGen";
+import { generateSubscription } from "~/graphql/graphqlGen";
 import { playerFields } from "~/graphql/playerFields";
 import { useAuthStore } from "~/stores/AuthStore";
-import { useMatchmakingStore } from "~/stores/MatchmakingStore";
 import { dateLocale } from "~/utilities/dateLocale";
 import {
   tacticalSectionLabelClasses,
   tacticalSectionTickClasses,
 } from "~/utilities/tacticalClasses";
+import { runTournamentAction } from "~/utilities/tournamentActions";
+import {
+  tournamentEloLadder,
+  tournamentPlayerElo,
+} from "~/utilities/tournamentElo";
 
 const props = defineProps<{
   tournament: Record<string, any>;
@@ -199,6 +205,14 @@ const teamSize = computed(
     0,
 );
 
+// The ladder the DRAFT rates on, not the one the player looks best on:
+// draft_tournament_free_agent_teams orders the pool by get_tournament_player_elo.
+const eloLadder = computed(() => tournamentEloLadder(props.tournament));
+
+function playerElo(agent: Agent) {
+  return tournamentPlayerElo(props.tournament, agent?.player);
+}
+
 // Only the first stage caps the field; later stages are fed by results.
 const stageMaxTeams = computed(() => {
   const max = props.tournament?.stages?.[0]?.max_teams;
@@ -329,13 +343,11 @@ const draftedTeams = computed(() => {
   return [...groups.values()]
     .map((group) => {
       const elos = group.members
-        .map((member) => Number(member.player?.elo))
-        .filter((elo) => Number.isFinite(elo));
+        .map((member) => playerElo(member))
+        .filter((elo): elo is number => elo !== null);
       const byElo = group.members
         .slice()
-        .sort(
-          (a, b) => Number(b.player?.elo ?? 0) - Number(a.player?.elo ?? 0),
-        );
+        .sort((a, b) => (playerElo(b) ?? 0) - (playerElo(a) ?? 0));
       return {
         ...group,
         // Grouped off an ELO-sorted list, so each unit keeps its members in
@@ -374,7 +386,7 @@ const topRatedWaitlisted = computed(() => {
     return null;
   }
   const best = pool.value.reduce((top, row) =>
-    Number(row.player?.elo ?? 0) > Number(top.player?.elo ?? 0) ? row : top,
+    (playerElo(row) ?? 0) > (playerElo(top) ?? 0) ? row : top,
   );
   return best.status === "waitlisted" ? best : null;
 });
@@ -389,16 +401,6 @@ const myEntry = computed(() => {
   );
 });
 
-// joinTournamentAsFreeAgent requires exactly RegistrationOpen, while the leave
-// rule also allows Setup. Offering Sign up during Setup produces a button that
-// can only ever fail, so the two windows are kept apart.
-const canSignUp = computed(
-  () =>
-    !!me.value &&
-    props.tournament?.status === e_tournament_status_enum.RegistrationOpen &&
-    !myEntry.value,
-);
-
 // The same window leaveTournamentAsFreeAgent enforces, drafted included: an
 // organizer can regenerate the teams while registration is still open, and
 // gating on that would strand everyone the draft touched with no way out of a
@@ -413,56 +415,6 @@ const canLeave = computed(
     ].includes(props.tournament?.status),
 );
 
-// The party IS the matchmaking lobby — there is no separate invite to accept,
-// because a captain who can already queue the whole lobby into a live match is
-// making a strictly smaller commitment by entering it in a draft. Read straight
-// off the store that owns lobby state; a second derivation of "who is in my
-// lobby" is how the two answers drift apart.
-const lobbyMembers = computed<Agent[]>(() => {
-  const lobby = useMatchmakingStore().currentLobby as Agent | undefined;
-  // Only accepted members count — a pending invite is not consent, and the API
-  // sizes the party the same way.
-  return ((lobby?.players ?? []) as Agent[]).filter(
-    (member) => member.status === "Accepted",
-  );
-});
-
-const lobbyCaptain = computed(
-  () => lobbyMembers.value.find((member) => member.captain) ?? null,
-);
-
-const isLobbyCaptain = computed(() => {
-  const steamId = String(me.value?.steam_id ?? "");
-  return (
-    !!steamId && String(lobbyCaptain.value?.player?.steam_id ?? "") === steamId
-  );
-});
-
-// A party of more than a full team can never be drafted, so the API refuses the
-// signup outright. Signing up alone is the intended escape hatch. Mirrors
-// tournament_free_agent_party_fits, which passes a format with no lineup size
-// rather than measuring against a zero.
-const lobbyFitsTeam = computed(
-  () => teamSize.value < 1 || lobbyMembers.value.length <= teamSize.value,
-);
-
-const lobbyMembersAlreadyInPool = computed(() => {
-  const steamIds = new Set(
-    pool.value.map((row) => String(row.player?.steam_id)),
-  );
-  return lobbyMembers.value.filter((member) =>
-    steamIds.has(String(member.player?.steam_id)),
-  ).length;
-});
-
-const showLobbySignUp = computed(
-  () => canSignUp.value && lobbyMembers.value.length > 1,
-);
-
-const canSignUpWithLobby = computed(
-  () => showLobbySignUp.value && isLobbyCaptain.value && lobbyFitsTeam.value,
-);
-
 function signUpTime(createdAt: string) {
   const date = new Date(createdAt);
   if (Number.isNaN(date.getTime())) {
@@ -506,52 +458,9 @@ function statusLabel(status: string) {
   return t("tournament.free_agents.status_registered");
 }
 
-async function runAction(
-  mutation: Record<string, any>,
-  failureTitle: string,
-): Promise<Record<string, any> | null> {
-  try {
-    const { data } = await client.mutate({
-      // Free-agent actions ship with the registration migration; zeus types
-      // for them only exist once `yarn codegen` has run against that schema.
-      mutation: generateMutation(mutation as any),
-    });
-    return (data as Record<string, any>) ?? null;
-  } catch (error: unknown) {
-    toast({
-      title: failureTitle,
-      description: error instanceof Error ? error.message : String(error),
-      variant: "destructive",
-    });
-    return null;
-  }
-}
-
-async function joinPool(withParty = false) {
-  await runAction(
-    {
-      joinTournamentAsFreeAgent: [
-        {
-          tournament_id: props.tournament.id,
-          // PRE-CODEGEN ESCAPE HATCH — `with_party` is a new action argument
-          // Zeus has not generated, so it rides the `as any` in runAction.
-          // Omitted entirely when false: that is byte-for-byte the old solo
-          // signup, which every unmigrated API still accepts.
-          ...(withParty ? { with_party: true } : {}),
-        },
-        {
-          success: true,
-        },
-      ],
-    },
-    withParty
-      ? t("tournament.free_agents.join_with_lobby_failed")
-      : t("tournament.free_agents.join_failed"),
-  );
-}
-
 async function leavePool() {
-  await runAction(
+  await runTournamentAction(
+    client,
     {
       leaveTournamentAsFreeAgent: [
         {
@@ -567,7 +476,8 @@ async function leavePool() {
 }
 
 async function draftTeams() {
-  const data = await runAction(
+  const data = await runTournamentAction(
+    client,
     {
       draftTournamentTeams: [
         {
@@ -628,16 +538,7 @@ async function draftTeams() {
           square
         />
         <Button
-          v-if="canSignUp && !showLobbySignUp"
-          size="sm"
-          class="h-8"
-          @click="joinPool()"
-        >
-          <UserPlus class="mr-1.5 h-3.5 w-3.5" />
-          {{ $t("tournament.free_agents.sign_up") }}
-        </Button>
-        <Button
-          v-else-if="canLeave"
+          v-if="canLeave"
           variant="outline"
           size="sm"
           class="h-8"
@@ -649,104 +550,11 @@ async function draftTeams() {
       </div>
     </div>
 
-    <!-- The whole lobby, or nobody: the consequence has to be readable before
-         the click, because there is no confirmation step and no invite for the
-         other members to accept. -->
-    <div
-      v-if="showLobbySignUp"
-      class="rounded-md border border-l-2 border-border border-l-[hsl(var(--tac-amber))] bg-card/45 p-3.5"
-    >
-      <div class="mb-2.5 flex flex-wrap items-center gap-2">
-        <Users class="h-3.5 w-3.5 text-[hsl(var(--tac-amber))]" />
-        <span
-          class="font-mono text-[0.62rem] uppercase tracking-[0.2em] text-[hsl(var(--tac-amber))]"
-        >
-          {{ $t("tournament.free_agents.lobby_title") }}
-        </span>
-        <TournamentChip :tone="lobbyFitsTeam ? 'amber' : 'warn'">
-          {{
-            $t("tournament.free_agents.lobby_size", {
-              count: lobbyMembers.length,
-              size: teamSize,
-            })
-          }}
-        </TournamentChip>
-      </div>
-
-      <div class="mb-2.5 flex flex-wrap items-center gap-x-4 gap-y-1">
-        <PlayerDisplay
-          v-for="member in lobbyMembers"
-          :key="member.player?.steam_id"
-          :player="member.player"
-          size="xs"
-          :linkable="true"
-          :show-elo="false"
-          :show-online="false"
-          :show-role="false"
-        />
-      </div>
-
-      <p class="text-[0.78rem] leading-relaxed text-muted-foreground">
-        {{
-          lobbyFitsTeam
-            ? $t("tournament.free_agents.lobby_hint", {
-                count: lobbyMembers.length,
-                size: teamSize,
-              })
-            : $t("tournament.free_agents.lobby_too_big", {
-                count: lobbyMembers.length,
-                size: teamSize,
-              })
-        }}
-      </p>
-
-      <p
-        v-if="lobbyFitsTeam && !isLobbyCaptain && lobbyCaptain"
-        class="mt-1.5 text-[0.78rem] leading-relaxed text-muted-foreground"
-      >
-        {{
-          $t("tournament.free_agents.lobby_not_captain", {
-            name: lobbyCaptain.player?.name,
-          })
-        }}
-      </p>
-
-      <p
-        v-if="canSignUpWithLobby && lobbyMembersAlreadyInPool > 0"
-        class="mt-1.5 text-[0.78rem] leading-relaxed text-muted-foreground"
-      >
-        {{
-          $t("tournament.free_agents.lobby_already_signed_up", {
-            count: lobbyMembersAlreadyInPool,
-          })
-        }}
-      </p>
-
-      <div class="mt-3 flex flex-wrap items-center gap-2">
-        <Button
-          v-if="canSignUpWithLobby"
-          size="sm"
-          class="h-8"
-          @click="joinPool(true)"
-        >
-          <Users class="mr-1.5 h-3.5 w-3.5" />
-          {{
-            $t("tournament.free_agents.sign_up_with_lobby", {
-              count: lobbyMembers.length,
-            })
-          }}
-        </Button>
-        <Button
-          :variant="canSignUpWithLobby ? 'outline' : 'default'"
-          size="sm"
-          class="h-8"
-          @click="joinPool()"
-        >
-          <UserPlus class="mr-1.5 h-3.5 w-3.5" />
-          {{ $t("tournament.free_agents.sign_up_alone") }}
-        </Button>
-      </div>
-    </div>
+    <TournamentFreeAgentSignUp
+      :tournament="tournament"
+      :pool="pool"
+      :my-entry="myEntry"
+    />
 
     <Empty v-if="pool.length === 0" class="min-h-[180px]">
       <EmptyTitle>{{ $t("tournament.free_agents.empty_title") }}</EmptyTitle>
@@ -826,15 +634,18 @@ async function draftTeams() {
                   :show-role="false"
                 />
               </div>
-              <span
-                class="w-14 shrink-0 text-right font-mono text-[0.78rem] font-semibold tabular-nums"
-                :class="
-                  row.position === 1 && filter === 'all'
-                    ? 'text-[hsl(var(--tac-amber))]'
-                    : 'text-foreground'
-                "
-              >
-                {{ row.agent.player?.elo ?? "—" }}
+              <span class="flex w-14 shrink-0 justify-end">
+                <PlayerElo
+                  v-if="playerElo(row.agent) !== null"
+                  :elo="row.agent.player?.elo"
+                  :type="eloLadder"
+                />
+                <span
+                  v-else
+                  class="font-mono text-[0.78rem] text-muted-foreground"
+                >
+                  &mdash;
+                </span>
               </span>
               <span
                 class="w-14 shrink-0 text-right font-mono text-[0.72rem] tabular-nums text-muted-foreground"
@@ -990,10 +801,18 @@ async function draftTeams() {
                     :show-online="false"
                     :show-role="false"
                   />
-                  <span
-                    class="shrink-0 font-mono text-[0.7rem] tabular-nums text-muted-foreground"
-                  >
-                    {{ member.player?.elo ?? "—" }}
+                  <span class="flex shrink-0 justify-end">
+                    <PlayerElo
+                      v-if="playerElo(member) !== null"
+                      :elo="member.player?.elo"
+                      :type="eloLadder"
+                    />
+                    <span
+                      v-else
+                      class="font-mono text-[0.7rem] text-muted-foreground"
+                    >
+                      &mdash;
+                    </span>
                   </span>
                 </div>
               </div>
diff --git a/components/tournament/TournamentJoinForm.vue b/components/tournament/TournamentJoinForm.vue
index d085710c..57b7793c 100644
--- a/components/tournament/TournamentJoinForm.vue
+++ b/components/tournament/TournamentJoinForm.vue
@@ -9,8 +9,10 @@ import {
   FormSection,
 } from "~/components/ui/form";
 import { Switch } from "~/components/ui/switch";
-import { MessageCircleWarning } from "lucide-vue-next";
+import { MessageCircleWarning, UserPlus, Users } from "lucide-vue-next";
+import AnimatedFilters from "~/components/common/AnimatedFilters.vue";
 import PlayerSearch from "~/components/PlayerSearch.vue";
+import TournamentFreeAgentSignUp from "~/components/tournament/TournamentFreeAgentSignUp.vue";
 import TeamSearch from "~/components/teams/TeamSearch.vue";
 import { Card } from "~/components/ui/card";
 import { Checkbox } from "~/components/ui/checkbox";
@@ -18,44 +20,31 @@ import PlayerDisplay from "~/components/PlayerDisplay.vue";
 </script>
 
 <template>
-  <form @submit.prevent="joinTournament" class="grid gap-4">
-    <h1 class="flex gap-2" v-if="!tournament.is_organizer">
-      <MessageCircleWarning />
-      {{
-        $t("tournament.join.requirements", {
-          count: tournament.min_players_per_lineup,
-        })
-      }}
-    </h1>
+  <div class="grid gap-4">
+    <AnimatedFilters
+      v-if="showEntryModes"
+      v-model="entryMode"
+      :options="entryModeOptions"
+      block
+      square
+      size="lg"
+    />
 
-    <FormField v-slot="{ value, handleChange }" name="new_team">
-      <FormItem>
-        <Card
-          class="h-9 rounded-md bg-gradient-to-br from-muted/50 to-muted/30 border-border/50 cursor-pointer"
-          @click="handleChange(!value)"
-        >
-          <div class="flex h-full flex-row items-center justify-between px-4">
-            <div class="space-y-0.5">
-              <FormLabel>{{ $t("tournament.team.new") }}</FormLabel>
-            </div>
-            <FormControl>
-              <Switch
-                class="pointer-events-none"
-                :model-value="value"
-                @update:model-value="handleChange"
-              />
-            </FormControl>
-          </div>
-        </Card>
-      </FormItem>
-    </FormField>
+    <form
+      v-if="entryMode === 'team'"
+      @submit.prevent="joinTournament"
+      class="grid gap-4"
+    >
+      <h1 class="flex gap-2" v-if="!tournament.is_organizer">
+        <MessageCircleWarning />
+        {{
+          $t("tournament.join.requirements", {
+            count: tournament.min_players_per_lineup,
+          })
+        }}
+      </h1>
 
-    <template v-if="tournament.is_organizer && form.values.new_team">
-      <FormField
-        v-if="tournament.can_join"
-        v-slot="{ value, handleChange }"
-        name="add_self_to_lineup"
-      >
+      <FormField v-slot="{ value, handleChange }" name="new_team">
         <FormItem>
           <Card
             class="h-9 rounded-md bg-gradient-to-br from-muted/50 to-muted/30 border-border/50 cursor-pointer"
@@ -63,9 +52,7 @@ import PlayerDisplay from "~/components/PlayerDisplay.vue";
           >
             <div class="flex h-full flex-row items-center justify-between px-4">
               <div class="space-y-0.5">
-                <FormLabel>{{
-                  $t("tournament.join.add_self_to_lineup")
-                }}</FormLabel>
+                <FormLabel>{{ $t("tournament.team.new") }}</FormLabel>
               </div>
               <FormControl>
                 <Switch
@@ -79,130 +66,188 @@ import PlayerDisplay from "~/components/PlayerDisplay.vue";
         </FormItem>
       </FormField>
 
-      <PlayerSearch
-        :label="$t('tournament.join.team_owner')"
-        @selected="setOwnerTeamOwner"
-        :selected="teamOwner"
-        :ineligible="ineligibleTournamentPlayers"
-        v-if="!form.values.add_self_to_lineup && form.values.new_team"
-      ></PlayerSearch>
-    </template>
+      <template v-if="tournament.is_organizer && form.values.new_team">
+        <FormField
+          v-if="tournament.can_join"
+          v-slot="{ value, handleChange }"
+          name="add_self_to_lineup"
+        >
+          <FormItem>
+            <Card
+              class="h-9 rounded-md bg-gradient-to-br from-muted/50 to-muted/30 border-border/50 cursor-pointer"
+              @click="handleChange(!value)"
+            >
+              <div
+                class="flex h-full flex-row items-center justify-between px-4"
+              >
+                <div class="space-y-0.5">
+                  <FormLabel>{{
+                    $t("tournament.join.add_self_to_lineup")
+                  }}</FormLabel>
+                </div>
+                <FormControl>
+                  <Switch
+                    class="pointer-events-none"
+                    :model-value="value"
+                    @update:model-value="handleChange"
+                  />
+                </FormControl>
+              </div>
+            </Card>
+          </FormItem>
+        </FormField>
 
-    <template v-if="!form.values.new_team">
-      <FormField v-slot="{ handleChange, componentField, meta }" name="team_id">
-        <FormItem>
-          <TeamSearch
-            :label="$t('tournament.team.select')"
-            :my-teams="canSelectAnyTeam ? false : true"
-            :is-admin="canSelectAnyTeam ? false : true"
-            :tournament-join-selector="!canSelectAnyTeam"
-            :ineligible="ineligibleTeams"
-            @selected="
-              async (team) => {
-                handleChange(String(team.id));
-                form.setFieldTouched('team_id', true);
-              }
-            "
-            v-model="componentField.modelValue"
-          ></TeamSearch>
-          <FormMessage v-if="meta.touched" />
-        </FormItem>
-      </FormField>
+        <PlayerSearch
+          :label="$t('tournament.join.team_owner')"
+          @selected="setOwnerTeamOwner"
+          :selected="teamOwner"
+          :ineligible="ineligibleTournamentPlayers"
+          v-if="!form.values.add_self_to_lineup && form.values.new_team"
+        ></PlayerSearch>
+      </template>
+
+      <template v-if="!form.values.new_team">
+        <FormField
+          v-slot="{ handleChange, componentField, meta }"
+          name="team_id"
+        >
+          <FormItem>
+            <TeamSearch
+              :label="$t('tournament.team.select')"
+              :my-teams="canSelectAnyTeam ? false : true"
+              :is-admin="canSelectAnyTeam ? false : true"
+              :tournament-join-selector="!canSelectAnyTeam"
+              :ineligible="ineligibleTeams"
+              @selected="
+                async (team) => {
+                  handleChange(String(team.id));
+                  form.setFieldTouched('team_id', true);
+                }
+              "
+              v-model="componentField.modelValue"
+            ></TeamSearch>
+            <FormMessage v-if="meta.touched" />
+          </FormItem>
+        </FormField>
 
-      <div v-if="form.values.team_id && rosterGroups.length" class="space-y-2">
-        <label
-          class="font-mono text-[0.62rem] uppercase tracking-[0.18em] text-muted-foreground"
+        <div
+          v-if="form.values.team_id && rosterGroups.length"
+          class="space-y-2"
         >
-          {{
-            $t("tournament.join.roster_range", {
-              selected: selectedPlayers.size,
-              max: maxLineup,
-            })
-          }}
-        </label>
-        <div v-for="group in rosterGroups" :key="group.key" class="space-y-1.5">
+          <label
+            class="font-mono text-[0.62rem] uppercase tracking-[0.18em] text-muted-foreground"
+          >
+            {{
+              $t("tournament.join.roster_range", {
+                selected: selectedPlayers.size,
+                max: maxLineup,
+              })
+            }}
+          </label>
           <div
-            class="font-mono text-[0.58rem] uppercase tracking-[0.18em] text-muted-foreground"
+            v-for="group in rosterGroups"
+            :key="group.key"
+            class="space-y-1.5"
           >
-            {{ $t(`tournament.join.group.${group.key}`) }} ·
-            {{ group.members.length }}
-          </div>
-          <ul class="grid gap-1.5 sm:grid-cols-2">
-            <li
-              v-for="member in group.members"
-              :key="member.player_steam_id"
-              class="flex items-center gap-2.5 rounded-md border border-border/60 bg-muted/20 px-3 py-2"
-              :class="rosterItemClass(member)"
-              @click="togglePlayer(member)"
+            <div
+              class="font-mono text-[0.58rem] uppercase tracking-[0.18em] text-muted-foreground"
             >
-              <Checkbox
-                :model-value="selectedPlayers.has(member.player_steam_id)"
-                :disabled="
-                  isTaken(member) ||
-                  (!selectedPlayers.has(member.player_steam_id) && atLineupCap)
-                "
-                @click.stop="togglePlayer(member)"
-              />
-              <PlayerDisplay :player="member.player" />
-              <span
-                v-if="isTaken(member)"
-                class="ml-auto text-[0.62rem] uppercase tracking-[0.12em] text-muted-foreground"
+              {{ $t(`tournament.join.group.${group.key}`) }} ·
+              {{ group.members.length }}
+            </div>
+            <ul class="grid gap-1.5 sm:grid-cols-2">
+              <li
+                v-for="member in group.members"
+                :key="member.player_steam_id"
+                class="flex items-center gap-2.5 rounded-md border border-border/60 bg-muted/20 px-3 py-2"
+                :class="rosterItemClass(member)"
+                @click="togglePlayer(member)"
               >
-                {{ $t("tournament.join.already_rostered") }}
-              </span>
-            </li>
-          </ul>
+                <Checkbox
+                  :model-value="selectedPlayers.has(member.player_steam_id)"
+                  :disabled="
+                    isTaken(member) ||
+                    (!selectedPlayers.has(member.player_steam_id) &&
+                      atLineupCap)
+                  "
+                  @click.stop="togglePlayer(member)"
+                />
+                <PlayerDisplay :player="member.player" />
+                <span
+                  v-if="isTaken(member)"
+                  class="ml-auto text-[0.62rem] uppercase tracking-[0.12em] text-muted-foreground"
+                >
+                  {{ $t("tournament.join.already_rostered") }}
+                </span>
+              </li>
+            </ul>
+          </div>
         </div>
-      </div>
-    </template>
-    <template v-else>
-      <FormSection :title="$t('team.form.identity')">
-        <div class="space-y-5">
-          <FormField v-slot="{ componentField, meta }" name="team_name">
-            <FormItem>
-              <FormLabel>{{ $t("common.team_name") }}</FormLabel>
-              <Input v-bind="componentField"></Input>
-              <FormMessage v-if="meta.touched" />
-            </FormItem>
-          </FormField>
+      </template>
+      <template v-else>
+        <FormSection :title="$t('team.form.identity')">
+          <div class="space-y-5">
+            <FormField v-slot="{ componentField, meta }" name="team_name">
+              <FormItem>
+                <FormLabel>{{ $t("common.team_name") }}</FormLabel>
+                <Input v-bind="componentField"></Input>
+                <FormMessage v-if="meta.touched" />
+              </FormItem>
+            </FormField>
 
-          <FormField v-slot="{ componentField, meta }" name="short_name">
-            <FormItem>
-              <FormLabel>{{ $t("team.form.short_name") }}</FormLabel>
-              <Input
-                v-bind="componentField"
-                :placeholder="$t('team.form.short_name_placeholder')"
-                maxlength="5"
-                class="uppercase tracking-[0.15em] font-mono"
-                @input="autoShortName = false"
-              ></Input>
-              <FormMessage v-if="meta.touched" />
-            </FormItem>
-          </FormField>
-        </div>
-      </FormSection>
-    </template>
+            <FormField v-slot="{ componentField, meta }" name="short_name">
+              <FormItem>
+                <FormLabel>{{ $t("team.form.short_name") }}</FormLabel>
+                <Input
+                  v-bind="componentField"
+                  :placeholder="$t('team.form.short_name_placeholder')"
+                  maxlength="5"
+                  class="uppercase tracking-[0.15em] font-mono"
+                  @input="autoShortName = false"
+                ></Input>
+                <FormMessage v-if="meta.touched" />
+              </FormItem>
+            </FormField>
+          </div>
+        </FormSection>
+      </template>
 
-    <Button
-      variant="tactical"
-      type="submit"
-      :loading="submitting"
-      :disabled="
-        (!form.values.new_team && !form.values.team_id) ||
-        (!form.values.new_team &&
-          !!form.values.team_id &&
-          selectedPlayers.size === 0) ||
-        (form.values.new_team && !form.values.team_name) ||
-        (form.values.new_team && !form.values.short_name) ||
-        (form.values.new_team &&
-          tournament.is_organizer &&
-          !form.values.add_self_to_lineup &&
-          !form.values.owner_steam_id)
-      "
-    >
-      {{ $t("tournament.join.title") }}
-    </Button>
-  </form>
+      <Button
+        variant="tactical"
+        type="submit"
+        :loading="submitting"
+        :disabled="
+          (!form.values.new_team && !form.values.team_id) ||
+          (!form.values.new_team &&
+            !!form.values.team_id &&
+            selectedPlayers.size === 0) ||
+          (form.values.new_team && !form.values.team_name) ||
+          (form.values.new_team && !form.values.short_name) ||
+          (form.values.new_team &&
+            tournament.is_organizer &&
+            !form.values.add_self_to_lineup &&
+            !form.values.owner_steam_id)
+        "
+      >
+        {{ $t("tournament.join.title") }}
+      </Button>
+    </form>
+
+    <template v-else>
+      <p
+        v-if="myFreeAgent"
+        class="rounded-md border border-border bg-card/45 p-3.5 text-[0.8rem] leading-relaxed text-muted-foreground"
+      >
+        {{ $t("tournament.free_agents.already_in_pool") }}
+      </p>
+      <TournamentFreeAgentSignUp
+        v-else
+        :tournament="tournament"
+        :my-entry="myFreeAgent"
+        @joined="$emit('close')"
+      />
+    </template>
+  </div>
 </template>
 
 <script lang="ts">
@@ -221,9 +266,23 @@ export default {
       type: Object,
       required: true,
     },
+    // The registration columns, fetched separately by TournamentDetail. Absent
+    // from the organizer's Add Team panel, which only ever registers a team.
+    registration: {
+      type: Object,
+      required: false,
+      default: null,
+    },
+    // The viewer's own free agent row, if they already have one.
+    myFreeAgent: {
+      type: Object,
+      required: false,
+      default: null,
+    },
   },
   data() {
     return {
+      entryModeOverride: null as string | null,
       submitting: false,
       teamOwner: null,
       autoShortName: true,
@@ -302,6 +361,57 @@ export default {
     canSelectAnyTeam() {
       return this.tournament.is_organizer || useAuthStore().isAdmin;
     },
+    registrationType() {
+      return this.registration?.registration_type ?? "teams";
+    },
+    freeAgentsAllowed() {
+      return ["free_agents", "both"].includes(this.registrationType);
+    },
+    // A free-agents-only tournament has no team entry to offer -- the pool is
+    // drafted into teams. The organizer keeps it: they can still seat a team
+    // the draft did not build.
+    teamsAllowed() {
+      return (
+        this.registrationType !== "free_agents" ||
+        !!this.tournament.is_organizer
+      );
+    },
+    showEntryModes() {
+      return this.freeAgentsAllowed && this.teamsAllowed;
+    },
+    entryModeOptions() {
+      return [
+        {
+          key: "team",
+          label: this.$t("tournament.join.mode.team"),
+          icon: Users,
+        },
+        {
+          key: "free_agent",
+          label: this.$t("tournament.join.mode.free_agent"),
+          icon: UserPlus,
+        },
+      ];
+    },
+    // `registration` arrives on its own subscription, so the sheet can open
+    // before the answer to "does this tournament take free agents" does -- the
+    // mode has to follow it rather than be latched once on mount.
+    entryMode: {
+      get() {
+        const mode =
+          this.entryModeOverride ?? (this.teamsAllowed ? "team" : "free_agent");
+        if (mode === "free_agent" && !this.freeAgentsAllowed) {
+          return "team";
+        }
+        if (mode === "team" && !this.teamsAllowed) {
+          return "free_agent";
+        }
+        return mode;
+      },
+      set(value: string) {
+        this.entryModeOverride = value;
+      },
+    },
     ineligibleTeams(): Record<string, string> {
       const map: Record<string, string> = {};
       for (const team of this.tournament.teams || []) {
diff --git a/i18n/locales/ar_SA.json b/i18n/locales/ar_SA.json
index 3d9d1169..927d002d 100644
--- a/i18n/locales/ar_SA.json
+++ b/i18n/locales/ar_SA.json
@@ -5664,6 +5664,10 @@
     "settings": "الإعدادات",
     "join": {
       "title": "انضم إلى البطولة",
+      "mode": {
+        "team": "كفريق",
+        "free_agent": "كلاعب حر"
+      },
       "add_self_to_lineup": "أضف نفسك إلى التشكيلة",
       "team_owner": "مالك الفريق",
       "requirements": "تحتاج إلى {count} لاعبين على الأقل للانضمام إلى هذه البطولة",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "المختارون",
       "filter_waitlist": "قائمة الانتظار",
       "sign_up": "سجّل",
+      "sign_up_hint": "لا يوجد فريق؟ سجّل وحدك وسيضعك السحب في فريق من {size} لاعبين عند إغلاق التسجيل.",
+      "joined": "أنت الآن ضمن قائمة اللاعبين الأحرار",
       "leave": "غادر المجموعة",
+      "already_in_pool": "أنت مسجّل بالفعل كلاعب حر في هذه البطولة.",
       "sign_up_alone": "سجّل وحدك",
       "sign_up_with_lobby": "سجّل الـ {count} جميعًا",
       "lobby_title": "أحضر لوبيك",
diff --git a/i18n/locales/da_DK.json b/i18n/locales/da_DK.json
index d42360be..56419359 100644
--- a/i18n/locales/da_DK.json
+++ b/i18n/locales/da_DK.json
@@ -5664,6 +5664,10 @@
     "settings": "Indstillinger",
     "join": {
       "title": "Tilmeld turnering",
+      "mode": {
+        "team": "Som hold",
+        "free_agent": "Som free agent"
+      },
       "add_self_to_lineup": "Tilføj dig selv til opstillingen",
       "team_owner": "Holdejer",
       "requirements": "Du skal have mindst {count} spillere for at tilmelde denne turnering",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "Draftet",
       "filter_waitlist": "Venteliste",
       "sign_up": "Tilmeld dig",
+      "sign_up_hint": "Intet hold? Tilmeld dig alene, så placerer draften dig på et hold på {size}, når tilmeldingen lukker.",
+      "joined": "Du er i free agent-puljen",
       "leave": "Forlad puljen",
+      "already_in_pool": "Du er allerede tilmeldt som free agent til denne turnering.",
       "sign_up_alone": "Tilmeld dig alene",
       "sign_up_with_lobby": "Tilmeld alle {count}",
       "lobby_title": "Tag din lobby med",
diff --git a/i18n/locales/de_DE.json b/i18n/locales/de_DE.json
index 2e778863..d0120a6a 100644
--- a/i18n/locales/de_DE.json
+++ b/i18n/locales/de_DE.json
@@ -5664,6 +5664,10 @@
     "settings": "Einstellungen",
     "join": {
       "title": "Turnier beitreten",
+      "mode": {
+        "team": "Als Team",
+        "free_agent": "Als Free Agent"
+      },
       "add_self_to_lineup": "Mich zum Lineup hinzufügen",
       "team_owner": "Team-Owner",
       "requirements": "Du brauchst mindestens {count} Spieler, um diesem Turnier beizutreten",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "Gedraftet",
       "filter_waitlist": "Warteliste",
       "sign_up": "Anmelden",
+      "sign_up_hint": "Kein Team? Melde dich allein an, und beim Anmeldeschluss setzt dich der Draft in ein Team aus {size} Spielern.",
+      "joined": "Du bist im Free-Agent-Pool",
       "leave": "Pool verlassen",
+      "already_in_pool": "Du bist für dieses Turnier bereits als Free Agent angemeldet.",
       "sign_up_alone": "Allein anmelden",
       "sign_up_with_lobby": "Alle {count} anmelden",
       "lobby_title": "Nimm deine Lobby mit",
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index eb5fdd91..47c8992f 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -5664,6 +5664,10 @@
     "settings": "Settings",
     "join": {
       "title": "Join Tournament",
+      "mode": {
+        "team": "As a team",
+        "free_agent": "As a free agent"
+      },
       "add_self_to_lineup": "Add Self to Lineup",
       "team_owner": "Team Owner",
       "requirements": "You need at least {count} players to join this tournament",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "Drafted",
       "filter_waitlist": "Waitlist",
       "sign_up": "Sign up",
+      "sign_up_hint": "No team? Sign up on your own and the draft places you on a team of {size} when registration closes.",
+      "joined": "You are in the free agent pool",
       "leave": "Leave pool",
+      "already_in_pool": "You are already signed up as a free agent for this tournament.",
       "sign_up_alone": "Sign up alone",
       "sign_up_with_lobby": "Sign up all {count}",
       "lobby_title": "Bring your lobby",
diff --git a/i18n/locales/es_ES.json b/i18n/locales/es_ES.json
index 30283022..0b00b98a 100644
--- a/i18n/locales/es_ES.json
+++ b/i18n/locales/es_ES.json
@@ -5664,6 +5664,10 @@
     "settings": "Ajustes",
     "join": {
       "title": "Unirse al torneo",
+      "mode": {
+        "team": "Como equipo",
+        "free_agent": "Como agente libre"
+      },
       "add_self_to_lineup": "Añadirme a la alineación",
       "team_owner": "Propietario del equipo",
       "requirements": "Necesitas al menos {count} jugadores para unirte a este torneo",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "Drafteados",
       "filter_waitlist": "Lista de espera",
       "sign_up": "Apuntarse",
+      "sign_up_hint": "¿Sin equipo? Apúntate solo y el draft te colocará en un equipo de {size} cuando se cierren las inscripciones.",
+      "joined": "Estás en el grupo de agentes libres",
       "leave": "Salir del grupo",
+      "already_in_pool": "Ya estás apuntado como agente libre en este torneo.",
       "sign_up_alone": "Apuntarse solo",
       "sign_up_with_lobby": "Apuntar a los {count}",
       "lobby_title": "Trae tu lobby",
diff --git a/i18n/locales/fr_FR.json b/i18n/locales/fr_FR.json
index 1b4e997f..6e92301f 100644
--- a/i18n/locales/fr_FR.json
+++ b/i18n/locales/fr_FR.json
@@ -5664,6 +5664,10 @@
     "settings": "Paramètres",
     "join": {
       "title": "Rejoindre le tournoi",
+      "mode": {
+        "team": "En équipe",
+        "free_agent": "En agent libre"
+      },
       "add_self_to_lineup": "M'ajouter à la composition",
       "team_owner": "Propriétaire de l'équipe",
       "requirements": "Il te faut au moins {count} joueurs pour rejoindre ce tournoi",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "Draftés",
       "filter_waitlist": "Liste d'attente",
       "sign_up": "S'inscrire",
+      "sign_up_hint": "Pas d'équipe ? Inscris-toi seul et le draft te placera dans une équipe de {size} à la clôture des inscriptions.",
+      "joined": "Tu es dans le pool d'agents libres",
       "leave": "Quitter le pool",
+      "already_in_pool": "Tu es déjà inscrit comme agent libre à ce tournoi.",
       "sign_up_alone": "S'inscrire seul",
       "sign_up_with_lobby": "Inscrire les {count}",
       "lobby_title": "Emmène ton lobby",
diff --git a/i18n/locales/it_IT.json b/i18n/locales/it_IT.json
index e8a7600e..2c334943 100644
--- a/i18n/locales/it_IT.json
+++ b/i18n/locales/it_IT.json
@@ -5664,6 +5664,10 @@
     "settings": "Impostazioni",
     "join": {
       "title": "Unisciti al torneo",
+      "mode": {
+        "team": "Come team",
+        "free_agent": "Come free agent"
+      },
       "add_self_to_lineup": "Aggiungiti al lineup",
       "team_owner": "Proprietario del team",
       "requirements": "Ti servono almeno {count} giocatori per unirti a questo torneo",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "Draftati",
       "filter_waitlist": "Lista d'attesa",
       "sign_up": "Iscriviti",
+      "sign_up_hint": "Nessun team? Iscriviti da solo e alla chiusura delle iscrizioni il draft ti assegnerà a un team da {size}.",
+      "joined": "Sei nel pool dei free agent",
       "leave": "Esci dal pool",
+      "already_in_pool": "Sei già iscritto come free agent a questo torneo.",
       "sign_up_alone": "Iscriviti da solo",
       "sign_up_with_lobby": "Iscrivi tutti e {count}",
       "lobby_title": "Porta la tua lobby",
diff --git a/i18n/locales/ja_JP.json b/i18n/locales/ja_JP.json
index deed4bde..c2cf9dc6 100644
--- a/i18n/locales/ja_JP.json
+++ b/i18n/locales/ja_JP.json
@@ -5664,6 +5664,10 @@
     "settings": "設定",
     "join": {
       "title": "トーナメントに参加",
+      "mode": {
+        "team": "チームで参加",
+        "free_agent": "フリーエージェントで参加"
+      },
       "add_self_to_lineup": "自分を出場メンバーに追加",
       "team_owner": "チームオーナー",
       "requirements": "このトーナメントに参加するには最低 {count} 人のプレイヤーが必要です",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "ドラフト済み",
       "filter_waitlist": "補欠",
       "sign_up": "登録する",
+      "sign_up_hint": "チームがなくてもソロで登録できます。登録が締め切られると、ドラフトで{size}人チームに振り分けられます。",
+      "joined": "フリーエージェントプールに登録しました",
       "leave": "プールから抜ける",
+      "already_in_pool": "このトーナメントにはすでにフリーエージェントとして登録済みです。",
       "sign_up_alone": "ソロで登録",
       "sign_up_with_lobby": "{count}人全員を登録",
       "lobby_title": "ロビーごと参加",
diff --git a/i18n/locales/ko_KR.json b/i18n/locales/ko_KR.json
index 7d0ff233..dda02350 100644
--- a/i18n/locales/ko_KR.json
+++ b/i18n/locales/ko_KR.json
@@ -5664,6 +5664,10 @@
     "settings": "설정",
     "join": {
       "title": "토너먼트 참가",
+      "mode": {
+        "team": "팀으로 참가",
+        "free_agent": "프리 에이전트로 참가"
+      },
       "add_self_to_lineup": "본인을 라인업에 추가",
       "team_owner": "팀 소유자",
       "requirements": "이 토너먼트에 참가하려면 최소 {count}명의 플레이어가 필요합니다",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "드래프트됨",
       "filter_waitlist": "대기 명단",
       "sign_up": "신청하기",
+      "sign_up_hint": "팀이 없나요? 혼자 신청하면 등록이 마감될 때 드래프트가 {size}인 팀에 배정합니다.",
+      "joined": "프리 에이전트 풀에 등록되었습니다",
       "leave": "풀에서 나가기",
+      "already_in_pool": "이미 이 토너먼트에 프리 에이전트로 신청되어 있습니다.",
       "sign_up_alone": "혼자 신청",
       "sign_up_with_lobby": "{count}명 모두 신청",
       "lobby_title": "로비째로 신청하기",
diff --git a/i18n/locales/pl_PL.json b/i18n/locales/pl_PL.json
index a9d18464..72f654e1 100644
--- a/i18n/locales/pl_PL.json
+++ b/i18n/locales/pl_PL.json
@@ -5664,6 +5664,10 @@
     "settings": "Ustawienia",
     "join": {
       "title": "Dołącz do turnieju",
+      "mode": {
+        "team": "Jako drużyna",
+        "free_agent": "Jako wolny zawodnik"
+      },
       "add_self_to_lineup": "Dodaj siebie do ustawienia",
       "team_owner": "Właściciel drużyny",
       "requirements": "Potrzebujesz co najmniej {count} graczy, aby dołączyć do tego turnieju",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "Wybrani w drafcie",
       "filter_waitlist": "Lista rezerwowa",
       "sign_up": "Zapisz się",
+      "sign_up_hint": "Nie masz drużyny? Zapisz się sam, a po zamknięciu zapisów draft przydzieli cię do {size}-osobowej drużyny.",
+      "joined": "Jesteś w puli wolnych zawodników",
       "leave": "Opuść pulę",
+      "already_in_pool": "Jesteś już zapisany do tego turnieju jako wolny zawodnik.",
       "sign_up_alone": "Zapisz się sam",
       "sign_up_with_lobby": "Zapisz wszystkich {count}",
       "lobby_title": "Weź swoje lobby",
diff --git a/i18n/locales/pt_BR.json b/i18n/locales/pt_BR.json
index b0c23bd6..d77c8463 100644
--- a/i18n/locales/pt_BR.json
+++ b/i18n/locales/pt_BR.json
@@ -5664,6 +5664,10 @@
     "settings": "Configurações",
     "join": {
       "title": "Inscrever-se no Torneio",
+      "mode": {
+        "team": "Como equipe",
+        "free_agent": "Como agente livre"
+      },
       "add_self_to_lineup": "Adicionar a si mesmo na Lineup",
       "team_owner": "Dono da Equipe",
       "requirements": "Você precisa de pelo menos {count} jogador(es) para participar deste torneio",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "Draftados",
       "filter_waitlist": "Lista de espera",
       "sign_up": "Inscrever-se",
+      "sign_up_hint": "Sem equipe? Inscreva-se sozinho e o draft vai te colocar em uma equipe de {size} quando as inscrições fecharem.",
+      "joined": "Você está no grupo de agentes livres",
       "leave": "Sair do grupo",
+      "already_in_pool": "Você já está inscrito como agente livre neste torneio.",
       "sign_up_alone": "Inscrever-se sozinho",
       "sign_up_with_lobby": "Inscrever os {count}",
       "lobby_title": "Traga seu lobby",
diff --git a/i18n/locales/ru_RU.json b/i18n/locales/ru_RU.json
index 0a387ca8..914e05f0 100644
--- a/i18n/locales/ru_RU.json
+++ b/i18n/locales/ru_RU.json
@@ -5664,6 +5664,10 @@
     "settings": "Настройки",
     "join": {
       "title": "Присоединиться к турниру",
+      "mode": {
+        "team": "Командой",
+        "free_agent": "Свободным агентом"
+      },
       "add_self_to_lineup": "Добавить себя в состав",
       "team_owner": "Владелец команды",
       "requirements": "Для участия в турнире нужно минимум {count} игроков",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "Взяты на драфте",
       "filter_waitlist": "Лист ожидания",
       "sign_up": "Записаться",
+      "sign_up_hint": "Нет команды? Запишитесь в одиночку — при закрытии регистрации драфт определит вас в команду из {size} игроков.",
+      "joined": "Вы в пуле свободных агентов",
       "leave": "Покинуть пул",
+      "already_in_pool": "Вы уже записаны на этот турнир как свободный агент.",
       "sign_up_alone": "Записаться одному",
       "sign_up_with_lobby": "Записать всех {count}",
       "lobby_title": "Возьми своё лобби",
diff --git a/i18n/locales/sv_SE.json b/i18n/locales/sv_SE.json
index 466a3d9b..ffb6111d 100644
--- a/i18n/locales/sv_SE.json
+++ b/i18n/locales/sv_SE.json
@@ -5664,6 +5664,10 @@
     "settings": "Inställningar",
     "join": {
       "title": "Gå med i turnering",
+      "mode": {
+        "team": "Som lag",
+        "free_agent": "Som free agent"
+      },
       "add_self_to_lineup": "Lägg till dig själv i laguppställningen",
       "team_owner": "Lagägare",
       "requirements": "Du behöver minst {count} spelare för att gå med i denna turnering",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "Draftade",
       "filter_waitlist": "Väntelista",
       "sign_up": "Anmäl dig",
+      "sign_up_hint": "Inget lag? Anmäl dig själv, så placerar draften dig i ett lag på {size} när anmälan stänger.",
+      "joined": "Du är med i free agent-poolen",
       "leave": "Lämna poolen",
+      "already_in_pool": "Du är redan anmäld som free agent till den här turneringen.",
       "sign_up_alone": "Anmäl dig själv",
       "sign_up_with_lobby": "Anmäl alla {count}",
       "lobby_title": "Ta med ditt lobby",
diff --git a/i18n/locales/tr_TR.json b/i18n/locales/tr_TR.json
index dfdf175c..f9b20836 100644
--- a/i18n/locales/tr_TR.json
+++ b/i18n/locales/tr_TR.json
@@ -5664,6 +5664,10 @@
     "settings": "Ayarlar",
     "join": {
       "title": "Turnuvaya Katıl",
+      "mode": {
+        "team": "Takım olarak",
+        "free_agent": "Serbest oyuncu olarak"
+      },
       "add_self_to_lineup": "Kendini Dizilişe Ekle",
       "team_owner": "Takım Sahibi",
       "requirements": "Bu turnuvaya katılmak için en az {count} oyuncuya ihtiyacın var",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "Seçilenler",
       "filter_waitlist": "Yedek listesi",
       "sign_up": "Kaydol",
+      "sign_up_hint": "Takımın yok mu? Tek başına kaydol; kayıtlar kapandığında draft seni {size} kişilik bir takıma yerleştirir.",
+      "joined": "Serbest oyuncu havuzundasın",
       "leave": "Havuzdan ayrıl",
+      "already_in_pool": "Bu turnuvaya zaten serbest oyuncu olarak kaydoldun.",
       "sign_up_alone": "Tek başına kaydol",
       "sign_up_with_lobby": "{count} kişinin hepsini kaydet",
       "lobby_title": "Lobini de getir",
diff --git a/i18n/locales/uk_UA.json b/i18n/locales/uk_UA.json
index 94a9d36a..0f20cbd6 100644
--- a/i18n/locales/uk_UA.json
+++ b/i18n/locales/uk_UA.json
@@ -5664,6 +5664,10 @@
     "settings": "Налаштування",
     "join": {
       "title": "Приєднатися до турніру",
+      "mode": {
+        "team": "Командою",
+        "free_agent": "Вільним агентом"
+      },
       "add_self_to_lineup": "Додати себе до складу",
       "team_owner": "Власник команди",
       "requirements": "Потрібно щонайменше {count} гравців, щоб приєднатися до цього турніру",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "Взяті на драфті",
       "filter_waitlist": "Список очікування",
       "sign_up": "Записатися",
+      "sign_up_hint": "Немає команди? Запишіться самостійно — після закриття реєстрації драфт визначить вас до команди з {size} гравців.",
+      "joined": "Ви в пулі вільних агентів",
       "leave": "Покинути пул",
+      "already_in_pool": "Ви вже записані на цей турнір як вільний агент.",
       "sign_up_alone": "Записатися самому",
       "sign_up_with_lobby": "Записати всіх {count}",
       "lobby_title": "Візьми своє лобі",
diff --git a/i18n/locales/zh_Hans.json b/i18n/locales/zh_Hans.json
index b91e67d8..aa80299a 100644
--- a/i18n/locales/zh_Hans.json
+++ b/i18n/locales/zh_Hans.json
@@ -5664,6 +5664,10 @@
     "settings": "设置",
     "join": {
       "title": "加入赛事",
+      "mode": {
+        "team": "以队伍身份",
+        "free_agent": "以自由选手身份"
+      },
       "add_self_to_lineup": "将自己加入阵容",
       "team_owner": "队伍拥有者",
       "requirements": "您需要至少 {count} 名玩家才能加入此赛事",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "已选入",
       "filter_waitlist": "候补",
       "sign_up": "报名",
+      "sign_up_hint": "没有队伍？单人报名即可，报名截止时分队会把你分到一支 {size} 人的队伍。",
+      "joined": "你已加入自由选手池",
       "leave": "退出选手池",
+      "already_in_pool": "你已经以自由选手身份报名了本赛事。",
       "sign_up_alone": "单人报名",
       "sign_up_with_lobby": "{count} 人一起报名",
       "lobby_title": "带上你的大厅",
diff --git a/i18n/locales/zh_Hant.json b/i18n/locales/zh_Hant.json
index 0fe9cf87..e1e83178 100644
--- a/i18n/locales/zh_Hant.json
+++ b/i18n/locales/zh_Hant.json
@@ -5664,6 +5664,10 @@
     "settings": "設定",
     "join": {
       "title": "加入賽事",
+      "mode": {
+        "team": "以隊伍身分",
+        "free_agent": "以自由選手身分"
+      },
       "add_self_to_lineup": "將自己加入陣容",
       "team_owner": "隊伍擁有者",
       "requirements": "您需要至少 {count} 名選手才能加入此賽事",
@@ -6266,7 +6270,10 @@
       "filter_drafted": "已選入",
       "filter_waitlist": "候補",
       "sign_up": "報名",
+      "sign_up_hint": "沒有隊伍？單人報名即可，報名截止時分隊會把你分到一支 {size} 人的隊伍。",
+      "joined": "你已加入自由選手池",
       "leave": "退出選手池",
+      "already_in_pool": "你已經以自由選手身分報名本賽事。",
       "sign_up_alone": "單人報名",
       "sign_up_with_lobby": "{count} 人一起報名",
       "lobby_title": "帶上你的大廳",
diff --git a/utilities/tournamentActions.ts b/utilities/tournamentActions.ts
new file mode 100644
index 00000000..85bc6cca
--- /dev/null
+++ b/utilities/tournamentActions.ts
@@ -0,0 +1,27 @@
+import { toast } from "~/components/ui/toast";
+import { generateMutation } from "~/graphql/graphqlGen";
+
+/**
+ * Free-agent and draft actions ship with the registration migration, so zeus
+ * only types them once `yarn codegen` has run against that schema — the
+ * selection is asserted rather than inferred until it has.
+ */
+export async function runTournamentAction(
+  client: { mutate: (options: Record<string, any>) => Promise<any> },
+  mutation: Record<string, any>,
+  failureTitle: string,
+): Promise<Record<string, any> | null> {
+  try {
+    const { data } = await client.mutate({
+      mutation: generateMutation(mutation as any),
+    });
+    return (data as Record<string, any>) ?? null;
+  } catch (error: unknown) {
+    toast({
+      title: failureTitle,
+      description: error instanceof Error ? error.message : String(error),
+      variant: "destructive",
+    });
+    return null;
+  }
+}
diff --git a/utilities/tournamentElo.ts b/utilities/tournamentElo.ts
new file mode 100644
index 00000000..fd0a1bd3
--- /dev/null
+++ b/utilities/tournamentElo.ts
@@ -0,0 +1,41 @@
+type EloLadder = "Competitive" | "Wingman";
+
+type TournamentLike =
+  | {
+      min_players_per_lineup?: number | string | null;
+      max_players_per_lineup?: number | string | null;
+    }
+  | null
+  | undefined;
+
+type PlayerLike =
+  | { elo?: Record<string, number | null> | null }
+  | null
+  | undefined;
+
+/**
+ * Mirrors get_tournament_player_elo: a 2-per-lineup format is rated on the
+ * Wingman ladder and everything else on Competitive. The entry gate, the draft
+ * and the free agent pool all have to read the same ladder the server does.
+ */
+export function tournamentEloLadder(tournament: TournamentLike): EloLadder {
+  const size =
+    Number(tournament?.min_players_per_lineup) ||
+    Number(tournament?.max_players_per_lineup) ||
+    0;
+  return size === 2 ? "Wingman" : "Competitive";
+}
+
+/**
+ * `players.elo` is a per-ladder map, never a single number — rendering or
+ * comparing the column itself yields raw JSON and NaN.
+ */
+export function tournamentPlayerElo(
+  tournament: TournamentLike,
+  player: PlayerLike,
+): number | null {
+  const value = Number(
+    player?.elo?.[tournamentEloLadder(tournament).toLowerCase()],
+  );
+  return Number.isFinite(value) ? value : null;
+}