diff --git a/app/routes/leagues/$leagueId.settings.tsx b/app/routes/leagues/$leagueId.settings.tsx
index 7b181ea..d7ebfbb 100644
--- a/app/routes/leagues/$leagueId.settings.tsx
+++ b/app/routes/leagues/$leagueId.settings.tsx
@@ -126,11 +126,15 @@ export async function loader(args: Route.LoaderArgs) {
         : null;
     })
   );
-  const ownerMap = new Map(
-    owners
-      .filter((o): o is NonNullable<typeof o> => o !== null)
-      .map((o) => [o.clerkId, o.name])
-  );
+  const validOwners = owners.filter((o): o is NonNullable<typeof o> => o !== null);
+  const ownerMap = new Map(validOwners.map((o) => [o.clerkId, o.name]));
+
+  // League members (team owners) - available to all commissioners for adding co-commissioners
+  const leagueMembers = validOwners.map((o) => ({
+    id: o.id,
+    clerkId: o.clerkId,
+    name: o.name,
+  }));
 
   return {
     league,
@@ -142,6 +146,7 @@ export async function loader(args: Route.LoaderArgs) {
     draftSlots,
     isAdmin,
     allUsers,
+    leagueMembers,
     ownerMap: Object.fromEntries(ownerMap),
     commissioners: commissionerUserData,
     currentUserId: userId,
@@ -544,7 +549,7 @@ export async function action(args: Route.ActionArgs) {
 }
 
 export default function LeagueSettings({ loaderData, actionData }: Route.ComponentProps) {
-  const { league, season, teams, teamCount, teamsWithOwners, allSportsSeasons, draftSlots, isAdmin, allUsers, ownerMap, commissioners, currentUserId } = loaderData;
+  const { league, season, teams, teamCount, teamsWithOwners, allSportsSeasons, draftSlots, isAdmin, allUsers, leagueMembers, ownerMap, commissioners, currentUserId } = loaderData;
   const navigation = useNavigation();
   const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
   const [selectedSports, setSelectedSports] = useState<Set<string>>(
@@ -1170,17 +1175,17 @@ export default function LeagueSettings({ loaderData, actionData }: Route.Compone
               ))}
             </div>
 
-            {isAdmin && (
-              <div className="border-t pt-4">
-                <p className="text-sm font-medium mb-3">Add Commissioner</p>
-                <Form method="post" className="flex gap-2">
-                  <input type="hidden" name="intent" value="add-commissioner" />
-                  <Select name="userClerkId" required>
-                    <SelectTrigger className="flex-1">
-                      <SelectValue placeholder="Select a user" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {allUsers.map((user) => {
+            <div className="border-t pt-4">
+              <p className="text-sm font-medium mb-3">Add Commissioner</p>
+              <Form method="post" className="flex gap-2">
+                <input type="hidden" name="intent" value="add-commissioner" />
+                <Select name="userClerkId" required>
+                  <SelectTrigger className="flex-1">
+                    <SelectValue placeholder="Select a user" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {isAdmin ? (
+                      allUsers.map((user) => {
                         const alreadyCommissioner = commissioners.some(
                           (c) => c.userId === user.clerkId
                         );
@@ -1194,20 +1199,36 @@ export default function LeagueSettings({ loaderData, actionData }: Route.Compone
                             {alreadyCommissioner && " (already commissioner)"}
                           </SelectItem>
                         );
-                      })}
-                    </SelectContent>
-                  </Select>
-                  <Button
-                    type="submit"
-                    variant="outline"
-                    size="sm"
-                    disabled={navigation.state === "submitting"}
-                  >
-                    Add
-                  </Button>
-                </Form>
-              </div>
-            )}
+                      })
+                    ) : (
+                      leagueMembers.map((member) => {
+                        const alreadyCommissioner = commissioners.some(
+                          (c) => c.userId === member.clerkId
+                        );
+                        return (
+                          <SelectItem
+                            key={member.id}
+                            value={member.clerkId}
+                            disabled={alreadyCommissioner}
+                          >
+                            {member.name || "Unknown"}
+                            {alreadyCommissioner && " (already commissioner)"}
+                          </SelectItem>
+                        );
+                      })
+                    )}
+                  </SelectContent>
+                </Select>
+                <Button
+                  type="submit"
+                  variant="outline"
+                  size="sm"
+                  disabled={navigation.state === "submitting"}
+                >
+                  Add
+                </Button>
+              </Form>
+            </div>
           </CardContent>
         </Card>