diff --git a/packages/e2e-tests/fixtures/admin/create-user-page.js b/packages/e2e-tests/fixtures/admin/create-user-page.js
index 135b38fb..e59ba2c5 100644
--- a/packages/e2e-tests/fixtures/admin/create-user-page.js
+++ b/packages/e2e-tests/fixtures/admin/create-user-page.js
@@ -14,8 +14,12 @@ export class AdminCreateUserPage extends AuthenticatedPage {
     this.roleInput = page.getByTestId('role.id-autocomplete');
     this.createButton = page.getByTestId('create-button');
     this.pageTitle = page.getByTestId('create-user-title');
-    this.invitationEmailInfoAlert = page.getByTestId('invitation-email-info-alert');
-    this.acceptInvitationLink = page.getByTestId('invitation-email-info-alert').getByRole('link');
+    this.invitationEmailInfoAlert = page.getByTestId(
+      'invitation-email-info-alert'
+    );
+    this.acceptInvitationLink = page
+      .getByTestId('invitation-email-info-alert')
+      .getByRole('link');
   }
 
   seed(seed) {
diff --git a/packages/e2e-tests/fixtures/admin/edit-user-page.js b/packages/e2e-tests/fixtures/admin/edit-user-page.js
index 4bc3a1b6..d0ee043f 100644
--- a/packages/e2e-tests/fixtures/admin/edit-user-page.js
+++ b/packages/e2e-tests/fixtures/admin/edit-user-page.js
@@ -13,9 +13,10 @@ export class AdminEditUserPage extends AuthenticatedPage {
     super(page);
     this.fullNameInput = page.getByTestId('full-name-input');
     this.emailInput = page.getByTestId('email-input');
-    this.roleInput = page.getByTestId('role.id-autocomplete');
+    this.roleInput = page.getByTestId('roleId-autocomplete');
     this.updateButton = page.getByTestId('update-button');
     this.pageTitle = page.getByTestId('edit-user-title');
+    this.fieldError = page.locator('p[id$="-helper-text"]');
   }
 
   /**
diff --git a/packages/e2e-tests/tests/admin/manage-users.spec.js b/packages/e2e-tests/tests/admin/manage-users.spec.js
index d6fc1507..35b7490b 100644
--- a/packages/e2e-tests/tests/admin/manage-users.spec.js
+++ b/packages/e2e-tests/tests/admin/manage-users.spec.js
@@ -5,281 +5,243 @@ const { test, expect } = require('../../fixtures/index');
  * otherwise tests will fail since users are only *soft*-deleted
  */
 test.describe('User management page', () => {
-
   test.beforeEach(async ({ adminUsersPage }) => {
     await adminUsersPage.navigateTo();
     await adminUsersPage.closeSnackbar();
   });
 
-  test(
-    'User creation and deletion process',
-    async ({ adminCreateUserPage, adminEditUserPage, adminUsersPage }) => {
-      adminCreateUserPage.seed(9000);
-      const user = adminCreateUserPage.generateUser();
-      await adminUsersPage.usersLoader.waitFor({
-        state: 'detached' /* Note: state: 'visible' introduces flakiness
+  test('User creation and deletion process', async ({
+    adminCreateUserPage,
+    adminEditUserPage,
+    adminUsersPage,
+  }) => {
+    adminCreateUserPage.seed(9000);
+    const user = adminCreateUserPage.generateUser();
+    await adminUsersPage.usersLoader.waitFor({
+      state: 'detached' /* Note: state: 'visible' introduces flakiness
         because visibility: hidden is used as part of the state transition in
         notistack, see
         https://github.com/iamhosseindhv/notistack/blob/122f47057eb7ce5a1abfe923316cf8475303e99a/src/transitions/Collapse/Collapse.tsx#L110
-        */
+        */,
+    });
+    await test.step('Create a user', async () => {
+      await adminUsersPage.createUserButton.click();
+      await adminCreateUserPage.fullNameInput.fill(user.fullName);
+      await adminCreateUserPage.emailInput.fill(user.email);
+      await adminCreateUserPage.roleInput.click();
+      await adminCreateUserPage.page
+        .getByRole('option', { name: 'Admin' })
+        .click();
+      await adminCreateUserPage.createButton.click();
+      await adminCreateUserPage.invitationEmailInfoAlert.waitFor({
+        state: 'attached',
       });
-      await test.step(
-        'Create a user',
-        async () => {
-          await adminUsersPage.createUserButton.click();
-          await adminCreateUserPage.fullNameInput.fill(user.fullName);
-          await adminCreateUserPage.emailInput.fill(user.email);
-          await adminCreateUserPage.roleInput.click();
-          await adminCreateUserPage.page.getByRole(
-            'option', { name: 'Admin' }
-          ).click();
-          await adminCreateUserPage.createButton.click();
-          await adminCreateUserPage.invitationEmailInfoAlert.waitFor({
-            state: 'attached'
-          });
 
-          const snackbar = await adminUsersPage.getSnackbarData(
-            'snackbar-create-user-success'
-          );
-          await expect(snackbar.variant).toBe('success');
-          await adminUsersPage.navigateTo();
-          await adminUsersPage.closeSnackbar();
-        }
+      const snackbar = await adminUsersPage.getSnackbarData(
+        'snackbar-create-user-success'
       );
-      await test.step(
-        'Check the user exists with the expected properties',
-        async () => {
-          await adminUsersPage.findUserPageWithEmail(user.email);
-          const userRow = await adminUsersPage.getUserRowByEmail(user.email);
-          const data = await adminUsersPage.getRowData(userRow);
-          await expect(data.email).toBe(user.email);
-          await expect(data.fullName).toBe(user.fullName);
-          await expect(data.role).toBe('Admin');
-        }
+      await expect(snackbar.variant).toBe('success');
+      await adminUsersPage.navigateTo();
+      await adminUsersPage.closeSnackbar();
+    });
+    await test.step('Check the user exists with the expected properties', async () => {
+      await adminUsersPage.findUserPageWithEmail(user.email);
+      const userRow = await adminUsersPage.getUserRowByEmail(user.email);
+      const data = await adminUsersPage.getRowData(userRow);
+      await expect(data.email).toBe(user.email);
+      await expect(data.fullName).toBe(user.fullName);
+      await expect(data.role).toBe('Admin');
+    });
+    await test.step('Edit user info and make sure the edit works correctly', async () => {
+      await adminUsersPage.findUserPageWithEmail(user.email);
+
+      let userRow = await adminUsersPage.getUserRowByEmail(user.email);
+      await adminUsersPage.clickEditUser(userRow);
+      await adminEditUserPage.waitForLoad(user.fullName);
+      const newUserInfo = adminEditUserPage.generateUser();
+      await adminEditUserPage.fullNameInput.fill(newUserInfo.fullName);
+      await adminEditUserPage.updateButton.click();
+
+      const snackbar = await adminUsersPage.getSnackbarData(
+        'snackbar-edit-user-success'
       );
-      await test.step(
-        'Edit user info and make sure the edit works correctly',
-        async () => {
-          await adminUsersPage.findUserPageWithEmail(user.email);
+      await expect(snackbar.variant).toBe('success');
+      await adminUsersPage.closeSnackbar();
 
-          let userRow = await adminUsersPage.getUserRowByEmail(user.email);
-          await adminUsersPage.clickEditUser(userRow);
-          await adminEditUserPage.waitForLoad(user.fullName);
-          const newUserInfo = adminEditUserPage.generateUser();
-          await adminEditUserPage.fullNameInput.fill(newUserInfo.fullName);
-          await adminEditUserPage.updateButton.click();
+      await adminUsersPage.findUserPageWithEmail(user.email);
+      userRow = await adminUsersPage.getUserRowByEmail(user.email);
+      const rowData = await adminUsersPage.getRowData(userRow);
+      await expect(rowData.fullName).toBe(newUserInfo.fullName);
+    });
+    await test.step('Delete user and check the page confirms this deletion', async () => {
+      await adminUsersPage.findUserPageWithEmail(user.email);
+      const userRow = await adminUsersPage.getUserRowByEmail(user.email);
+      await adminUsersPage.clickDeleteUser(userRow);
+      const modal = adminUsersPage.deleteUserModal;
+      await modal.deleteButton.click();
 
-          const snackbar = await adminUsersPage.getSnackbarData(
-            'snackbar-edit-user-success'
-          );
-          await expect(snackbar.variant).toBe('success');
-          await adminUsersPage.closeSnackbar();
-
-          await adminUsersPage.findUserPageWithEmail(user.email);
-          userRow = await adminUsersPage.getUserRowByEmail(user.email);
-          const rowData = await adminUsersPage.getRowData(userRow);
-          await expect(rowData.fullName).toBe(newUserInfo.fullName);
-        }
+      const snackbar = await adminUsersPage.getSnackbarData(
+        'snackbar-delete-user-success'
       );
-      await test.step(
-        'Delete user and check the page confirms this deletion',
-        async () => {
-          await adminUsersPage.findUserPageWithEmail(user.email);
-          const userRow = await adminUsersPage.getUserRowByEmail(user.email);
-          await adminUsersPage.clickDeleteUser(userRow);
-          const modal = adminUsersPage.deleteUserModal;
-          await modal.deleteButton.click();
+      await expect(snackbar.variant).toBe('success');
+      await adminUsersPage.closeSnackbar();
+      await expect(userRow).not.toBeVisible(false);
+    });
+  });
 
-          const snackbar = await adminUsersPage.getSnackbarData(
-            'snackbar-delete-user-success'
-          );
-          await expect(snackbar.variant).toBe('success');
-          await adminUsersPage.closeSnackbar();
-          await expect(userRow).not.toBeVisible(false);
-        }
+  test('Creating a user which has been deleted', async ({
+    adminCreateUserPage,
+    adminUsersPage,
+  }) => {
+    adminCreateUserPage.seed(9100);
+    const testUser = adminCreateUserPage.generateUser();
+
+    await test.step('Create the test user', async () => {
+      await adminUsersPage.navigateTo();
+      await adminUsersPage.createUserButton.click();
+      await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
+      await adminCreateUserPage.emailInput.fill(testUser.email);
+      await adminCreateUserPage.roleInput.click();
+      await adminCreateUserPage.page
+        .getByRole('option', { name: 'Admin' })
+        .click();
+      await adminCreateUserPage.createButton.click();
+      const snackbar = await adminUsersPage.getSnackbarData(
+        'snackbar-create-user-success'
       );
+      await expect(snackbar.variant).toBe('success');
+      await adminUsersPage.closeSnackbar();
     });
 
-  test(
-    'Creating a user which has been deleted',
-    async ({ adminCreateUserPage, adminUsersPage }) => {
-      adminCreateUserPage.seed(9100);
-      const testUser = adminCreateUserPage.generateUser();
-
-      await test.step(
-        'Create the test user',
-        async () => {
-          await adminUsersPage.navigateTo();
-          await adminUsersPage.createUserButton.click();
-          await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
-          await adminCreateUserPage.emailInput.fill(testUser.email);
-          await adminCreateUserPage.roleInput.click();
-          await adminCreateUserPage.page.getByRole(
-            'option', { name: 'Admin' }
-          ).click();
-          await adminCreateUserPage.createButton.click();
-          const snackbar = await adminUsersPage.getSnackbarData(
-            'snackbar-create-user-success'
-          );
-          await expect(snackbar.variant).toBe('success');
-          await adminUsersPage.closeSnackbar();
-        }
+    await test.step('Delete the created user', async () => {
+      await adminUsersPage.navigateTo();
+      await adminUsersPage.findUserPageWithEmail(testUser.email);
+      const userRow = await adminUsersPage.getUserRowByEmail(testUser.email);
+      await adminUsersPage.clickDeleteUser(userRow);
+      const modal = adminUsersPage.deleteUserModal;
+      await modal.deleteButton.click();
+      const snackbar = await adminUsersPage.getSnackbarData(
+        'snackbar-delete-user-success'
       );
+      await expect(snackbar).not.toBeNull();
+      await expect(snackbar.variant).toBe('success');
+      await adminUsersPage.closeSnackbar();
+      await expect(userRow).not.toBeVisible(false);
+    });
 
-      await test.step(
-        'Delete the created user',
-        async () => {
-          await adminUsersPage.navigateTo();
-          await adminUsersPage.findUserPageWithEmail(testUser.email);
-          const userRow = await adminUsersPage.getUserRowByEmail(testUser.email);
-          await adminUsersPage.clickDeleteUser(userRow);
-          const modal = adminUsersPage.deleteUserModal;
-          await modal.deleteButton.click();
-          const snackbar = await adminUsersPage.getSnackbarData(
-            'snackbar-delete-user-success'
-          );
-          await expect(snackbar).not.toBeNull();
-          await expect(snackbar.variant).toBe('success');
-          await adminUsersPage.closeSnackbar();
-          await expect(userRow).not.toBeVisible(false);
-        }
+    await test.step('Create the user again', async () => {
+      await adminUsersPage.createUserButton.click();
+      await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
+      await adminCreateUserPage.emailInput.fill(testUser.email);
+      await adminCreateUserPage.roleInput.click();
+      await adminCreateUserPage.page
+        .getByRole('option', { name: 'Admin' })
+        .click();
+      await adminCreateUserPage.createButton.click();
+      const snackbar = await adminUsersPage.getSnackbarData('snackbar-error');
+      await expect(snackbar.variant).toBe('error');
+      await adminUsersPage.closeSnackbar();
+    });
+  });
+
+  test('Creating a user which already exists', async ({
+    adminCreateUserPage,
+    adminUsersPage,
+    page,
+  }) => {
+    adminCreateUserPage.seed(9200);
+    const testUser = adminCreateUserPage.generateUser();
+
+    await test.step('Create the test user', async () => {
+      await adminUsersPage.createUserButton.click();
+      await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
+      await adminCreateUserPage.emailInput.fill(testUser.email);
+      await adminCreateUserPage.roleInput.click();
+      await adminCreateUserPage.page
+        .getByRole('option', { name: 'Admin' })
+        .click();
+      await adminCreateUserPage.createButton.click();
+      const snackbar = await adminUsersPage.getSnackbarData(
+        'snackbar-create-user-success'
       );
+      await expect(snackbar.variant).toBe('success');
+      await adminUsersPage.closeSnackbar();
+    });
 
-      await test.step(
-        'Create the user again',
-        async () => {
-          await adminUsersPage.createUserButton.click();
-          await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
-          await adminCreateUserPage.emailInput.fill(testUser.email);
-          await adminCreateUserPage.roleInput.click();
-          await adminCreateUserPage.page.getByRole(
-            'option', { name: 'Admin' }
-          ).click();
-          await adminCreateUserPage.createButton.click();
-          const snackbar = await adminUsersPage.getSnackbarData('snackbar-error');
-          await expect(snackbar.variant).toBe('error');
-          await adminUsersPage.closeSnackbar();
-        }
+    await test.step('Create the user again', async () => {
+      await adminUsersPage.navigateTo();
+      await adminUsersPage.createUserButton.click();
+      await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
+      await adminCreateUserPage.emailInput.fill(testUser.email);
+      const createUserPageUrl = page.url();
+      await adminCreateUserPage.roleInput.click();
+      await adminCreateUserPage.page
+        .getByRole('option', { name: 'Admin' })
+        .click();
+      await adminCreateUserPage.createButton.click();
+
+      await expect(page.url()).toBe(createUserPageUrl);
+      const snackbar = await adminUsersPage.getSnackbarData('snackbar-error');
+      await expect(snackbar.variant).toBe('error');
+      await adminUsersPage.closeSnackbar();
+    });
+  });
+
+  test('Editing a user to have the same email as another user should not be allowed', async ({
+    adminCreateUserPage,
+    adminEditUserPage,
+    adminUsersPage,
+    page,
+  }) => {
+    adminCreateUserPage.seed(9300);
+    const user1 = adminCreateUserPage.generateUser();
+    const user2 = adminCreateUserPage.generateUser();
+    await test.step('Create the first user', async () => {
+      await adminUsersPage.navigateTo();
+      await adminUsersPage.createUserButton.click();
+      await adminCreateUserPage.fullNameInput.fill(user1.fullName);
+      await adminCreateUserPage.emailInput.fill(user1.email);
+      await adminCreateUserPage.roleInput.click();
+      await adminCreateUserPage.page
+        .getByRole('option', { name: 'Admin' })
+        .click();
+      await adminCreateUserPage.createButton.click();
+      const snackbar = await adminUsersPage.getSnackbarData(
+        'snackbar-create-user-success'
       );
-    }
-  );
+      await expect(snackbar.variant).toBe('success');
+      await adminUsersPage.closeSnackbar();
+    });
 
-  test(
-    'Creating a user which already exists',
-    async ({ adminCreateUserPage, adminUsersPage, page }) => {
-      adminCreateUserPage.seed(9200);
-      const testUser = adminCreateUserPage.generateUser();
-
-      await test.step(
-        'Create the test user',
-        async () => {
-          await adminUsersPage.createUserButton.click();
-          await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
-          await adminCreateUserPage.emailInput.fill(testUser.email);
-          await adminCreateUserPage.roleInput.click();
-          await adminCreateUserPage.page.getByRole(
-            'option', { name: 'Admin' }
-          ).click();
-          await adminCreateUserPage.createButton.click();
-          const snackbar = await adminUsersPage.getSnackbarData(
-            'snackbar-create-user-success'
-          );
-          await expect(snackbar.variant).toBe('success');
-          await adminUsersPage.closeSnackbar();
-        }
+    await test.step('Create the second user', async () => {
+      await adminUsersPage.navigateTo();
+      await adminUsersPage.createUserButton.click();
+      await adminCreateUserPage.fullNameInput.fill(user2.fullName);
+      await adminCreateUserPage.emailInput.fill(user2.email);
+      await adminCreateUserPage.roleInput.click();
+      await adminCreateUserPage.page
+        .getByRole('option', { name: 'Admin' })
+        .click();
+      await adminCreateUserPage.createButton.click();
+      const snackbar = await adminUsersPage.getSnackbarData(
+        'snackbar-create-user-success'
       );
+      await expect(snackbar.variant).toBe('success');
+      await adminUsersPage.closeSnackbar();
+    });
 
-      await test.step(
-        'Create the user again',
-        async () => {
-          await adminUsersPage.navigateTo();
-          await adminUsersPage.createUserButton.click();
-          await adminCreateUserPage.fullNameInput.fill(testUser.fullName);
-          await adminCreateUserPage.emailInput.fill(testUser.email);
-          const createUserPageUrl = page.url();
-          await adminCreateUserPage.roleInput.click();
-          await adminCreateUserPage.page.getByRole(
-            'option', { name: 'Admin' }
-          ).click();
-          await adminCreateUserPage.createButton.click();
+    await test.step('Try editing the second user to have the email of the first user', async () => {
+      await adminUsersPage.navigateTo();
+      await adminUsersPage.findUserPageWithEmail(user2.email);
+      let userRow = await adminUsersPage.getUserRowByEmail(user2.email);
+      await adminUsersPage.clickEditUser(userRow);
+      await adminEditUserPage.waitForLoad(user2.fullName);
+      await adminEditUserPage.emailInput.fill(user1.email);
+      const editPageUrl = page.url();
+      await adminEditUserPage.updateButton.click();
 
-          await expect(page.url()).toBe(createUserPageUrl);
-          const snackbar = await adminUsersPage.getSnackbarData('snackbar-error');
-          await expect(snackbar.variant).toBe('error');
-          await adminUsersPage.closeSnackbar();
-        }
-      );
-    }
-  );
-
-  test(
-    'Editing a user to have the same email as another user should not be allowed',
-    async ({
-      adminCreateUserPage, adminEditUserPage, adminUsersPage, page
-    }) => {
-      adminCreateUserPage.seed(9300);
-      const user1 = adminCreateUserPage.generateUser();
-      const user2 = adminCreateUserPage.generateUser();
-      await test.step(
-        'Create the first user',
-        async () => {
-          await adminUsersPage.navigateTo();
-          await adminUsersPage.createUserButton.click();
-          await adminCreateUserPage.fullNameInput.fill(user1.fullName);
-          await adminCreateUserPage.emailInput.fill(user1.email);
-          await adminCreateUserPage.roleInput.click();
-          await adminCreateUserPage.page.getByRole(
-            'option', { name: 'Admin' }
-          ).click();
-          await adminCreateUserPage.createButton.click();
-          const snackbar = await adminUsersPage.getSnackbarData(
-            'snackbar-create-user-success'
-          );
-          await expect(snackbar.variant).toBe('success');
-          await adminUsersPage.closeSnackbar();
-        }
-      );
-
-      await test.step(
-        'Create the second user',
-        async () => {
-          await adminUsersPage.navigateTo();
-          await adminUsersPage.createUserButton.click();
-          await adminCreateUserPage.fullNameInput.fill(user2.fullName);
-          await adminCreateUserPage.emailInput.fill(user2.email);
-          await adminCreateUserPage.roleInput.click();
-          await adminCreateUserPage.page.getByRole(
-            'option', { name: 'Admin' }
-          ).click();
-          await adminCreateUserPage.createButton.click();
-          const snackbar = await adminUsersPage.getSnackbarData(
-            'snackbar-create-user-success'
-          );
-          await expect(snackbar.variant).toBe('success');
-          await adminUsersPage.closeSnackbar();
-        }
-      );
-
-      await test.step(
-        'Try editing the second user to have the email of the first user',
-        async () => {
-          await adminUsersPage.navigateTo();
-          await adminUsersPage.findUserPageWithEmail(user2.email);
-          let userRow = await adminUsersPage.getUserRowByEmail(user2.email);
-          await adminUsersPage.clickEditUser(userRow);
-          await adminEditUserPage.waitForLoad(user2.fullName);
-          await adminEditUserPage.emailInput.fill(user1.email);
-          const editPageUrl = page.url();
-          await adminEditUserPage.updateButton.click();
-
-          const snackbar = await adminUsersPage.getSnackbarData(
-            'snackbar-error'
-          );
-          await expect(snackbar.variant).toBe('error');
-          await adminUsersPage.closeSnackbar();
-          await expect(page.url()).toBe(editPageUrl);
-        }
-      );
-    }
-  );
+      await expect(adminEditUserPage.fieldError).toHaveCount(1);
+      await expect(page.url()).toBe(editPageUrl);
+    });
+  });
 });