diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Team/components/AddNewEditorModal.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Team/components/EditorUpsertModal.tsx
similarity index 67%
rename from editor.planx.uk/src/pages/FlowEditor/components/Team/components/AddNewEditorModal.tsx
rename to editor.planx.uk/src/pages/FlowEditor/components/Team/components/EditorUpsertModal.tsx
index 2d83add36d..08d9e1e050 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Team/components/AddNewEditorModal.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Team/components/EditorUpsertModal.tsx
@@ -17,15 +17,21 @@ import {
   AddNewEditorErrors,
   isUserAlreadyExistsError,
 } from "../errors/addNewEditorErrors";
-import { addNewEditorFormSchema } from "../formSchema";
+import { upsertEditorSchema } from "../formSchema";
 import { createAndAddUserToTeam } from "../queries/createAndAddUserToTeam";
-import { AddNewEditorFormValues, AddNewEditorModalProps } from "../types";
-import { optimisticallyUpdateMembersTable } from "./lib/optimisticallyUpdateMembersTable";
+import { AddNewEditorFormValues, EditorModalProps } from "../types";
+import {
+  optimisticallyAddNewMember,
+  optimisticallyUpdateExistingMember,
+} from "./lib/optimisticallyUpdateMembersTable";
+import { updateTeamMember } from "../queries/updateUser";
 
-export const AddNewEditorModal = ({
+export const EditorUpsertModal = ({
   showModal,
   setShowModal,
-}: AddNewEditorModalProps) => {
+  initialValues,
+  actionType,
+}: EditorModalProps) => {
   const [showUserAlreadyExistsError, setShowUserAlreadyExistsError] =
     useState<boolean>(false);
 
@@ -37,16 +43,27 @@ export const AddNewEditorModal = ({
 
   const handleSubmit = async (
     values: AddNewEditorFormValues,
-    { resetForm }: FormikHelpers<AddNewEditorFormValues>,
+    { resetForm }: FormikHelpers<AddNewEditorFormValues>
   ) => {
+    switch (actionType) {
+      case "add":
+        handleSubmitToAddNewUser();
+        break;
+      case "edit":
+        handleSubmitToUpdateUser();
+    }
+    resetForm({ values });
+  };
+
+  const handleSubmitToAddNewUser = async () => {
     const { teamId, teamSlug } = useStore.getState();
 
     const createUserResult = await createAndAddUserToTeam(
-      values.email,
-      values.firstName,
-      values.lastName,
+      formik.values.email,
+      formik.values.firstName,
+      formik.values.lastName,
       teamId,
-      teamSlug,
+      teamSlug
     ).catch((err) => {
       if (isUserAlreadyExistsError(err.message)) {
         setShowUserAlreadyExistsError(true);
@@ -61,26 +78,53 @@ export const AddNewEditorModal = ({
       return;
     }
     clearErrors();
-    optimisticallyUpdateMembersTable(values, createUserResult.id);
+    optimisticallyAddNewMember(formik.values, createUserResult.id);
     setShowModal(false);
     toast.success("Successfully added a user");
-    resetForm({ values });
+  };
+  const handleSubmitToUpdateUser = async () => {
+    if (!initialValues) {
+      return;
+    }
+    const response = await updateTeamMember(
+      initialValues.id,
+      formik.values
+    ).catch((err) => {
+      if (isUserAlreadyExistsError(err.message)) {
+        setShowUserAlreadyExistsError(true);
+      }
+      if (err.message === "Unable to update user") {
+        toast.error("Failed to update the user, please try again");
+      }
+      console.error(err);
+    });
+
+    if (!response) {
+      return;
+    }
+
+    clearErrors();
+    optimisticallyUpdateExistingMember(formik.values, initialValues.id);
+    setShowModal(false);
+    toast.success("Successfully updated a user");
   };
 
   const formik = useFormik<AddNewEditorFormValues>({
     initialValues: {
-      firstName: "",
-      lastName: "",
-      email: "",
+      firstName: initialValues?.firstName || "",
+      lastName: initialValues?.lastName || "",
+      email: initialValues?.email || "",
     },
-    validationSchema: addNewEditorFormSchema,
+    validationSchema: upsertEditorSchema,
     onSubmit: handleSubmit,
   });
 
   return (
     <Dialog
       aria-labelledby="dialog-heading"
-      data-testid="dialog-create-user"
+      data-testid={
+        actionType === "add" ? "dialog-create-user" : "dialog-edit-user"
+      }
       PaperProps={{
         sx: (theme) => ({
           width: "100%",
@@ -95,7 +139,11 @@ export const AddNewEditorModal = ({
       onClose={() => setShowModal(false)}
     >
       <form onSubmit={formik.handleSubmit}>
-        <DialogContent data-testid="modal-create-user">
+        <DialogContent
+          data-testid={
+            actionType === "add" ? "modal-create-user" : "modal-edit-user"
+          }
+        >
           <Box sx={{ mt: 1, mb: 4 }}>
             <Typography variant="h3" component="h2" id="dialog-heading">
               Add a new editor
@@ -112,6 +160,7 @@ export const AddNewEditorModal = ({
                     ? formik.errors.firstName
                     : undefined
                 }
+                value={formik.values.firstName}
               />
             </InputLabel>
             <InputLabel label="Last name" htmlFor="lastName">
@@ -124,6 +173,7 @@ export const AddNewEditorModal = ({
                     ? formik.errors.lastName
                     : undefined
                 }
+                value={formik.values.lastName}
               />
             </InputLabel>
             <InputLabel label="Email address" htmlFor="email">
@@ -136,6 +186,7 @@ export const AddNewEditorModal = ({
                     ? formik.errors.email
                     : undefined
                 }
+                value={formik.values.email}
               />
             </InputLabel>
           </InputGroup>
@@ -160,9 +211,14 @@ export const AddNewEditorModal = ({
                   variant="contained"
                   color="prompt"
                   type="submit"
-                  data-testid="modal-create-user-button"
+                  data-testid={
+                    actionType === "add"
+                      ? "modal-create-user-button"
+                      : "modal-edit-user-button"
+                  }
+                  disabled={!formik.dirty || !formik.isValid}
                 >
-                  Create user
+                  {actionType === "add" ? "Create user" : "Update user"}
                 </Button>
                 <Button
                   variant="contained"
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Team/components/MembersTable.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Team/components/MembersTable.tsx
index 8dd3dda581..70a11d3681 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Team/components/MembersTable.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Team/components/MembersTable.tsx
@@ -1,4 +1,6 @@
+import Button from "@mui/material/Button";
 import Chip from "@mui/material/Chip";
+import { styled } from "@mui/material/styles";
 import Table from "@mui/material/Table";
 import TableBody from "@mui/material/TableBody";
 import TableCell from "@mui/material/TableCell";
@@ -7,16 +9,30 @@ import TableHead from "@mui/material/TableHead";
 import TableRow from "@mui/material/TableRow";
 import { AddButton } from "pages/Team";
 import React, { useState } from "react";
+import Permission from "ui/editor/Permission";
 
 import { StyledAvatar, StyledTableRow } from "./../styles";
-import { MembersTableProps } from "./../types";
-import { AddNewEditorModal } from "./AddNewEditorModal";
+import { MembersTableProps, TeamMember } from "./../types";
+import { EditorUpsertModal } from "./EditorUpsertModal";
+
+const EditUserButton = styled(Button)(({ theme }) => ({
+  color: theme.palette.primary.main,
+  textDecoration: "underline",
+  boxShadow: "none",
+  "&:hover": {
+    boxShadow: "none",
+    color: theme.palette.primary.main,
+    textDecoration: "underline",
+  },
+}));
 
 export const MembersTable = ({
   members,
   showAddMemberButton,
 }: MembersTableProps) => {
-  const [showModal, setShowModal] = useState(false);
+  const [showAddModal, setShowAddModal] = useState<boolean>(false);
+  const [showUpdateModal, setShowUpdateModal] = useState<boolean>(false);
+  const [initialValues, setInitialValues] = useState<TeamMember | undefined>();
 
   const roleLabels: Record<string, string> = {
     platformAdmin: "Admin",
@@ -42,18 +58,24 @@ export const MembersTable = ({
           {showAddMemberButton && (
             <TableRow>
               <TableCell colSpan={3}>
-                <AddButton onClick={() => setShowModal(true)}>
+                <AddButton
+                  onClick={() => {
+                    setInitialValues(undefined);
+                    setShowAddModal(true);
+                  }}
+                >
                   Add a new editor
                 </AddButton>
               </TableCell>
             </TableRow>
           )}
         </Table>
-
-        {showModal && (
-          <AddNewEditorModal
-            showModal={showModal}
-            setShowModal={setShowModal}
+        {showAddModal && (
+          <EditorUpsertModal
+            showModal={showAddModal}
+            setShowModal={setShowAddModal}
+            initialValues={initialValues}
+            actionType={"add"}
           />
         )}
       </>
@@ -74,13 +96,14 @@ export const MembersTable = ({
               </TableCell>
               <TableCell>
                 <strong>Email</strong>
-              </TableCell>
+              </TableCell>{" "}
+              <TableCell></TableCell>
             </StyledTableRow>
           </TableHead>
           <TableBody
             data-testid={`members-table${showAddMemberButton && "-add-editor"}`}
           >
-            {members.map((member) => (
+            {members.map((member, i) => (
               <StyledTableRow key={member.id}>
                 <TableCell
                   sx={{
@@ -103,12 +126,30 @@ export const MembersTable = ({
                   />
                 </TableCell>
                 <TableCell>{member.email}</TableCell>
+                <Permission.IsPlatformAdmin>
+                  <TableCell>
+                    <EditUserButton
+                      onClick={() => {
+                        setShowUpdateModal(true);
+                        setInitialValues(member);
+                      }}
+                      data-testId={`edit-button-${i}`}
+                    >
+                      Edit
+                    </EditUserButton>
+                  </TableCell>
+                </Permission.IsPlatformAdmin>
               </StyledTableRow>
             ))}
             {showAddMemberButton && (
               <TableRow>
                 <TableCell colSpan={3}>
-                  <AddButton onClick={() => setShowModal(true)}>
+                  <AddButton
+                    onClick={() => {
+                      setInitialValues(undefined);
+                      setShowAddModal(true);
+                    }}
+                  >
                     Add a new editor
                   </AddButton>
                 </TableCell>
@@ -117,8 +158,22 @@ export const MembersTable = ({
           </TableBody>
         </Table>
       </TableContainer>
-      {showModal && (
-        <AddNewEditorModal showModal={showModal} setShowModal={setShowModal} />
+      {showAddModal && (
+        <EditorUpsertModal
+          showModal={showAddModal}
+          setShowModal={setShowAddModal}
+          initialValues={initialValues}
+          actionType={"add"}
+        />
+      )}
+      {showUpdateModal && (
+        <EditorUpsertModal
+          showModal={showUpdateModal}
+          setShowModal={setShowUpdateModal}
+          initialValues={initialValues}
+          userId={initialValues?.id || 1}
+          actionType={"edit"}
+        />
       )}
     </>
   );
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Team/components/lib/optimisticallyUpdateMembersTable.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Team/components/lib/optimisticallyUpdateMembersTable.tsx
index c29b2537ce..45b45299f2 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Team/components/lib/optimisticallyUpdateMembersTable.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Team/components/lib/optimisticallyUpdateMembersTable.tsx
@@ -2,17 +2,30 @@ import { useStore } from "pages/FlowEditor/lib/store";
 
 import { AddNewEditorFormValues, TeamMember } from "../../types";
 
-export const optimisticallyUpdateMembersTable = async (
+export const optimisticallyAddNewMember = async (
   values: AddNewEditorFormValues,
   userId: number,
 ) => {
+  const existingMembers = useStore.getState().teamMembers;
   const newMember: TeamMember = {
     ...values,
     role: "teamEditor",
     id: userId,
   };
 
-  const existingMembers = useStore.getState().teamMembers;
-
   await useStore.getState().setTeamMembers([...existingMembers, newMember]);
 };
+
+export const optimisticallyUpdateExistingMember = async (
+  values: AddNewEditorFormValues,
+  userId: number,
+) => {
+  const existingMembers = useStore.getState().teamMembers;
+  const updatedMembers: TeamMember[] = existingMembers.map((member) => {
+    if (member.id === userId) {
+      return { ...values, id: userId, role: member.role };
+    }
+    return member;
+  });
+  await useStore.getState().setTeamMembers(updatedMembers);
+};
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Team/formSchema.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Team/formSchema.tsx
index b2bd831c6f..1f9739fceb 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Team/formSchema.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Team/formSchema.tsx
@@ -1,7 +1,11 @@
 import * as Yup from "yup";
 
-export const addNewEditorFormSchema = Yup.object({
-  firstName: Yup.string().required("Required"),
-  lastName: Yup.string().required("Required"),
-  email: Yup.string().email("Invalid email address").required("Required"),
+export const upsertEditorSchema = Yup.object({
+  firstName: Yup.string().required("Enter a first name"),
+  lastName: Yup.string().required("Enter a last name"),
+  email: Yup.string()
+    .email(
+      "Enter an email address in the correct format, like example@email.com",
+    )
+    .required("Enter a valid email address"),
 });
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Team/queries/createAndAddUserToTeam.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Team/queries/createAndAddUserToTeam.tsx
index 6bd17e6ab0..594657bb63 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Team/queries/createAndAddUserToTeam.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Team/queries/createAndAddUserToTeam.tsx
@@ -12,7 +12,7 @@ export const createAndAddUserToTeam = async (
   firstName: string,
   lastName: string,
   teamId: number,
-  teamSlug: string,
+  teamSlug: string
 ) => {
   // NB: the user is hard-coded with the 'teamEditor' role for now
   const response: CreateAndAddUserResponse = await client.mutate({
@@ -45,6 +45,7 @@ export const createAndAddUserToTeam = async (
       { query: GET_USERS_FOR_TEAM_QUERY, variables: { teamSlug } },
     ],
   });
+
   if (response.data) {
     return response.data.insert_users_one;
   }
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Team/queries/updateUser.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Team/queries/updateUser.tsx
new file mode 100644
index 0000000000..545211d6a3
--- /dev/null
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Team/queries/updateUser.tsx
@@ -0,0 +1,32 @@
+import { gql } from "@apollo/client";
+import { client } from "../../../../../lib/graphql";
+import { AddNewEditorFormValues } from "../types";
+
+export const updateTeamMember = async (
+  userId: number,
+  userValues: AddNewEditorFormValues
+) => {
+  const response = await client.mutate({
+    mutation: gql`
+      mutation UpdateUser($userId: Int, $userValues: users_set_input) {
+        update_users(where: { id: { _eq: $userId } }, _set: $userValues) {
+          returning {
+            id
+          }
+        }
+      }
+    `,
+    variables: {
+      userId: userId,
+      userValues: {
+        first_name: userValues.firstName,
+        last_name: userValues.lastName,
+        email: userValues.email,
+      },
+    },
+  });
+  if (response.data) {
+    return response.data.update_users;
+  }
+  throw new Error("Unable to update user");
+};
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Team/tests/TeamMembers.addNewEditor.test.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Team/tests/TeamMembers.addNewEditor.test.tsx
index 2968cd0830..db8998eeb5 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Team/tests/TeamMembers.addNewEditor.test.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Team/tests/TeamMembers.addNewEditor.test.tsx
@@ -7,10 +7,11 @@ import { vi } from "vitest";
 import { axe } from "vitest-axe";
 
 import { setup } from "../../../../../testUtils";
-import { AddNewEditorModal } from "../components/AddNewEditorModal";
+import { EditorUpsertModal } from "../components/EditorUpsertModal";
 import { setupTeamMembersScreen } from "./helpers/setupTeamMembersScreen";
 import { userTriesToAddNewEditor } from "./helpers/userTriesToAddNewEditor";
 import { mockTeamMembersData } from "./mocks/mockTeamMembersData";
+import { emptyTeamMemberObj } from "./mocks/mockUsers";
 
 vi.mock(
   "pages/FlowEditor/components/Team/queries/createAndAddUserToTeam.tsx",
@@ -77,7 +78,12 @@ describe("when the addNewEditor modal is rendered", () => {
   it("should not have any accessibility issues", async () => {
     const { container } = setup(
       <DndProvider backend={HTML5Backend}>
-        <AddNewEditorModal showModal={true} setShowModal={() => {}} />
+        <EditorUpsertModal
+          showModal={true}
+          setShowModal={() => {}}
+          initialValues={emptyTeamMemberObj}
+          actionType="add"
+        />
       </DndProvider>,
     );
     await screen.findByTestId("modal-create-user");
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Team/tests/TeamMembers.updateEditor.test.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Team/tests/TeamMembers.updateEditor.test.tsx
new file mode 100644
index 0000000000..5d7884add8
--- /dev/null
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Team/tests/TeamMembers.updateEditor.test.tsx
@@ -0,0 +1,183 @@
+import { screen, waitFor, within } from "@testing-library/react";
+import { useStore } from "pages/FlowEditor/lib/store";
+import { vi } from "vitest";
+
+import { setupTeamMembersScreen } from "./helpers/setupTeamMembersScreen";
+import { mockTeamMembersData } from "./mocks/mockTeamMembersData";
+import { mockPlainUser, mockPlatformAdminUser } from "./mocks/mockUsers";
+
+vi.mock("pages/FlowEditor/components/Team/queries/updateUser.tsx", () => ({
+  updateTeamMember: vi.fn().mockResolvedValue({
+    id: 1,
+  }),
+}));
+
+describe("when a user presses 'edit button'", () => {
+  beforeEach(async () => {
+    useStore.setState({
+      teamMembers: mockTeamMembersData,
+      user: mockPlatformAdminUser,
+    });
+
+    const { user } = await setupTeamMembersScreen();
+
+    const teamEditorsTable = screen.getByTestId("team-editors");
+    const addEditorButton = await within(teamEditorsTable).findByTestId(
+      "edit-button-0"
+    );
+
+    user.click(addEditorButton);
+    // Start each test with an open modal
+  });
+
+  it("opens the modal and displays the input fields with all inputs prepopulated", async () => {
+    expect(await screen.findByTestId("modal-edit-user")).toBeVisible();
+    const firstNameInput = await screen.findByLabelText("First name");
+    const lastNameInput = await screen.findByLabelText("Last name");
+    const emailInput = await screen.findByLabelText("Email address");
+    // Sorted based on first letter of first name Bill > Donella in Mocks
+    expect(firstNameInput).toHaveDisplayValue("Bill");
+    expect(lastNameInput).toHaveDisplayValue("Sharpe");
+    expect(emailInput).toHaveDisplayValue("bill@example.com");
+  });
+  it("disables the update user button", async () => {
+    // find whole modal
+    const modal = await screen.findByRole("dialog");
+    expect(modal).toBeVisible();
+
+    const updateUserButton = await within(modal).findByRole("button", {
+      name: "Update user",
+    });
+
+    // disabled until form is 'dirty'
+    expect(updateUserButton).toBeDisabled();
+  });
+});
+
+describe("when a user deletes an input value", () => {
+  beforeEach(async () => {
+    useStore.setState({ teamMembers: mockTeamMembersData });
+  });
+  it("displays an error message when clicking away", async () => {
+    const { user } = await setupTeamMembersScreen();
+
+    const teamEditorsTable = screen.getByTestId("team-editors");
+    const addEditorButton = await within(teamEditorsTable).findByTestId(
+      "edit-button-0"
+    );
+    await user.click(addEditorButton);
+
+    const modal = await screen.findByRole("dialog");
+    const firstNameInput = await screen.findByLabelText("First name");
+    expect(firstNameInput).toHaveDisplayValue(mockTeamMembersData[1].firstName);
+
+    await user.clear(firstNameInput);
+
+    // initially no error
+    const firstNameError = await screen.findByTestId(/error-message-firstName/);
+    expect(firstNameError).toBeEmptyDOMElement();
+
+    await user.click(modal);
+
+    //error appears after clicking away
+    expect(firstNameError).not.toBeEmptyDOMElement();
+
+    const updateUserButton = await within(modal).findByRole("button", {
+      name: "Update user",
+    });
+
+    expect(updateUserButton).toBeDisabled();
+  });
+});
+
+describe("when a user updates a field correctly", () => {
+  beforeEach(async () => {
+    useStore.setState({ teamMembers: mockTeamMembersData });
+    const { user } = await setupTeamMembersScreen();
+
+    const teamEditorsTable = screen.getByTestId("team-editors");
+    const addEditorButton = await within(teamEditorsTable).findByTestId(
+      "edit-button-0"
+    );
+    await user.click(addEditorButton);
+
+    const modal = await screen.findByRole("dialog");
+    const firstNameInput = await screen.findByLabelText("First name");
+
+    await user.type(firstNameInput, "bo");
+
+    await user.click(modal);
+  });
+  it("updates the field", async () => {
+    const firstNameInput = await screen.findByLabelText("First name");
+    expect(firstNameInput).toHaveDisplayValue(
+      mockTeamMembersData[1].firstName + "bo"
+    );
+  });
+  it("enables the update user button", async () => {
+    const updateUserButton = await screen.findByRole("button", {
+      name: "Update user",
+    });
+    expect(updateUserButton).not.toBeDisabled();
+  });
+});
+
+describe("when a user correctly updates an Editor", () => {
+  beforeEach(async () => {
+    useStore.setState({ teamMembers: mockTeamMembersData });
+    const { user } = await setupTeamMembersScreen();
+
+    const teamEditorsTable = screen.getByTestId("team-editors");
+    const addEditorButton = await within(teamEditorsTable).findByTestId(
+      "edit-button-0"
+    );
+    await user.click(addEditorButton);
+
+    const firstNameInput = await screen.findByLabelText("First name");
+
+    await user.type(firstNameInput, "bo");
+
+    const updateUserButton = await screen.findByRole("button", {
+      name: "Update user",
+    });
+
+    await user.click(updateUserButton);
+  });
+  it("updates the member table with new details", async () => {
+    const membersTable = await screen.findByTestId("members-table-add-editor");
+    await waitFor(() => {
+      expect(within(membersTable).getByText(/Billbo/)).toBeInTheDocument();
+    });
+    expect(
+      await screen.findByText(/Successfully updated a user/)
+    ).toBeInTheDocument();
+  });
+  it("closes the modal", async () => {
+    await waitFor(() => {
+      expect(screen.queryByTestId("modal-edit-user")).not.toBeInTheDocument();
+    });
+  });
+  it("shows a success message", async () => {
+    expect(
+      await screen.findByText(/Successfully updated a user/)
+    ).toBeInTheDocument();
+  });
+});
+
+describe("when a user is not a platform admin", () => {
+  beforeEach(async () => {
+    useStore.setState({
+      teamMembers: mockTeamMembersData,
+      user: mockPlainUser,
+    });
+
+    await setupTeamMembersScreen();
+  });
+  it("does not show an edit button", async () => {
+    const teamEditorsTable = screen.getByTestId("team-editors");
+    const addEditorButton =
+      within(teamEditorsTable).queryByTestId("edit-button-0");
+
+    expect(addEditorButton).not.toBeInTheDocument();
+  });
+});
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Team/tests/mocks/mockUsers.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Team/tests/mocks/mockUsers.tsx
index c8d2de0121..14c9ba3cff 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Team/tests/mocks/mockUsers.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Team/tests/mocks/mockUsers.tsx
@@ -1,3 +1,5 @@
+import { User } from "@opensystemslab/planx-core/types";
+
 import { TeamMember } from "../../types";
 
 export const alreadyExistingUser: TeamMember = {
@@ -7,3 +9,33 @@ export const alreadyExistingUser: TeamMember = {
   id: 3,
   role: "teamEditor",
 };
+
+export const emptyTeamMemberObj: TeamMember = {
+  firstName: "",
+  lastName: "",
+  email: "",
+  id: 3,
+  role: "teamEditor",
+};
+
+export const mockPlainUser: User = {
+  isPlatformAdmin: false,
+  firstName: "r",
+  lastName: "r",
+  email: "r",
+  id: 909,
+  teams: [
+    {
+      role: "teamEditor",
+      team: {
+        name: "planX",
+        slug: "planx",
+        id: 0,
+      },
+    },
+  ],
+};
+export const mockPlatformAdminUser: User = {
+  ...mockPlainUser,
+  isPlatformAdmin: true,
+};
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Team/types.ts b/editor.planx.uk/src/pages/FlowEditor/components/Team/types.ts
index bf823c5352..c93d213188 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Team/types.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Team/types.ts
@@ -13,9 +13,16 @@ export interface AddNewEditorModalProps {
   showModal: boolean;
   setShowModal: React.Dispatch<SetStateAction<boolean>>;
 }
-
 export interface AddNewEditorFormValues {
   email: string;
   firstName: string;
   lastName: string;
 }
+
+export interface EditorModalProps {
+  showModal: boolean;
+  setShowModal: React.Dispatch<SetStateAction<boolean>>;
+  initialValues?: TeamMember;
+  userId?: number;
+  actionType: "add" | "edit";
+}
diff --git a/hasura.planx.uk/metadata/tables.yaml b/hasura.planx.uk/metadata/tables.yaml
index fd81722e10..78a98cbf2f 100644
--- a/hasura.planx.uk/metadata/tables.yaml
+++ b/hasura.planx.uk/metadata/tables.yaml
@@ -2270,5 +2270,7 @@
       permission:
         columns:
           - email
+          - first_name
+          - last_name
         filter: {}
         check: {}