diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Team/TeamMembers.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Team/TeamMembers.tsx
index b2d3e22a2e..c1d642d9c6 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Team/TeamMembers.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Team/TeamMembers.tsx
@@ -2,6 +2,7 @@ import Avatar from "@mui/material/Avatar";
 import Box from "@mui/material/Box";
 import Chip from "@mui/material/Chip";
 import Container from "@mui/material/Container";
+import Divider from "@mui/material/Divider";
 import { styled } from "@mui/material/styles";
 import Table from "@mui/material/Table";
 import TableBody from "@mui/material/TableBody";
@@ -32,6 +33,11 @@ export type TeamMember = Omit<User, "teams" | "isPlatformAdmin"> & {
   role: Role;
 };
 
+const roleLabels: Record<string, string> = {
+  platformAdmin: "Admin",
+  teamEditor: "Editor",
+};
+
 interface Props {
   teamMembersByRole: Record<string, TeamMember[]>;
 }
@@ -44,120 +50,107 @@ export const TeamMembers: React.FC<Props> = ({ teamMembersByRole }) => {
       return acc.concat(teamMembersByRole[role]);
     }, []);
 
+  const archivedMembers = otherRoles.filter(
+    (member) => member.role !== "platformAdmin" && !member.email,
+  );
+
+  const getRoleLabel = (role: string) => {
+    return roleLabels[role] || role;
+  };
+
+  const renderMemberTable = (members: TeamMember[]) => {
+    if (members.length === 0) {
+      return (
+        <>
+          <Table>
+            <TableHead>
+              <TableRow>
+                <TableCell>
+                  <strong>No members found</strong>
+                </TableCell>
+              </TableRow>
+            </TableHead>
+          </Table>
+        </>
+      );
+    }
+    return (
+      <TableContainer>
+        <Table>
+          <TableHead>
+            <StyledTableRow>
+              <TableCell sx={{ width: 300 }}>
+                <strong>User</strong>
+              </TableCell>
+              <TableCell sx={{ width: 200 }}>
+                <strong>Role</strong>
+              </TableCell>
+              <TableCell>
+                <strong>Email</strong>
+              </TableCell>
+            </StyledTableRow>
+          </TableHead>
+          <TableBody>
+            {members.map((member) => (
+              <StyledTableRow key={member.id}>
+                <TableCell
+                  sx={{
+                    display: "flex",
+                    flexDirection: "row",
+                    alignItems: "center",
+                  }}
+                >
+                  <StyledAvatar>
+                    {member.firstName[0]}
+                    {member.lastName[0]}
+                  </StyledAvatar>
+                  {member.firstName} {member.lastName}
+                </TableCell>
+                <TableCell>
+                  <Chip
+                    label={getRoleLabel(member.role)}
+                    size="small"
+                    sx={{ background: "#ddd" }}
+                  />
+                </TableCell>
+                <TableCell>{member.email}</TableCell>
+              </StyledTableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </TableContainer>
+    );
+  };
+
   return (
     <Container maxWidth="contentWrap">
       <Box py={7}>
         <EditorRow>
           <Typography variant="h2" component="h3" gutterBottom>
-            Team members
+            Team editors
           </Typography>
           <Typography variant="body1">
-            Team members have access to edit your flows and services.
+            Editors have access to edit your flows and services.
           </Typography>
-          <TableContainer>
-            <Table>
-              <TableHead>
-                <StyledTableRow>
-                  <TableCell sx={{ width: 300 }}>
-                    <strong>User</strong>
-                  </TableCell>
-                  <TableCell sx={{ width: 200 }}>
-                    <strong>Role</strong>
-                  </TableCell>
-                  <TableCell>
-                    <strong>Email</strong>
-                  </TableCell>
-                </StyledTableRow>
-              </TableHead>
-              <TableBody>
-                {otherRoles.map((member) => (
-                  <StyledTableRow key={member.id}>
-                    <TableCell
-                      sx={{
-                        display: "flex",
-                        flexDirection: "row",
-                        alignItems: "center",
-                      }}
-                    >
-                      <StyledAvatar>
-                        {member.firstName[0]}
-                        {member.lastName[0]}
-                      </StyledAvatar>
-                      {member.firstName} {member.lastName}
-                    </TableCell>
-                    <TableCell>
-                      <Chip
-                        label={member.role}
-                        size="small"
-                        sx={{ background: "#ddd" }}
-                      />
-                    </TableCell>
-                    <TableCell>{member.email}</TableCell>
-                  </StyledTableRow>
-                ))}
-              </TableBody>
-            </Table>
-          </TableContainer>
+          {renderMemberTable(otherRoles)}
         </EditorRow>
         <EditorRow>
           <Typography variant="h2" component="h3" gutterBottom>
-            Platform admins
+            Admins
           </Typography>
           <Typography variant="body1">
             Admins have editor access across all teams.
           </Typography>
-          <TableContainer>
-            <Table>
-              <TableHead>
-                <StyledTableRow>
-                  <TableCell sx={{ width: 300 }}>
-                    <strong>User</strong>
-                  </TableCell>
-                  <TableCell sx={{ width: 200 }}>
-                    <strong>Role</strong>
-                  </TableCell>
-                  <TableCell>
-                    <strong>Email</strong>
-                  </TableCell>
-                </StyledTableRow>
-              </TableHead>
-              <TableBody>
-                {platformAdmins.map((member) => (
-                  <StyledTableRow key={member.id}>
-                    <TableCell
-                      sx={{
-                        display: "flex",
-                        flexDirection: "row",
-                        alignItems: "center",
-                      }}
-                    >
-                      <StyledAvatar>
-                        {member.firstName[0]}
-                        {member.lastName[0]}
-                      </StyledAvatar>
-                      {member.firstName} {member.lastName}
-                    </TableCell>
-                    <TableCell>
-                      <Chip
-                        label={member.role}
-                        size="small"
-                        sx={{ background: "#ddd" }}
-                      />
-                    </TableCell>
-                    <TableCell>{member.email}</TableCell>
-                  </StyledTableRow>
-                ))}
-              </TableBody>
-            </Table>
-          </TableContainer>
+          {renderMemberTable(platformAdmins)}
         </EditorRow>
         <EditorRow>
           <Typography variant="h2" component="h3" gutterBottom>
-            Archived team members
+            Archived team editors
           </Typography>
           <Typography variant="body1">
-            Past members who no longer have access to your team.
+            Past members who no longer have access to edit your team.
           </Typography>
+          {renderMemberTable(archivedMembers)}
         </EditorRow>
       </Box>
     </Container>