diff --git a/packages/component-faraday-ui/src/PersonInvitation.js b/packages/component-faraday-ui/src/PersonInvitation.js
index 1ca824bb1354e7e4d00542cb6320fdac9e4b2d61..71109d03141ab391032d2906b6ac736c2c301b5b 100644
--- a/packages/component-faraday-ui/src/PersonInvitation.js
+++ b/packages/component-faraday-ui/src/PersonInvitation.js
@@ -30,8 +30,10 @@ const PersonInvitation = ({
           )}
         </OpenModal>
         <OpenModal
+          confirmText="Remove invite"
           onConfirm={revokeInvitation}
-          title="Are you sure you want to revoke the invitation?"
+          subtitle="Clicking ‘Remove’ will allow you to invite a different Handling Editor"
+          title="Remove invitation to Handling Editor?"
         >
           {showModal => (
             <IconButton
diff --git a/packages/component-faraday-ui/src/contextualBoxes/AssignHE.js b/packages/component-faraday-ui/src/contextualBoxes/AssignHE.js
index 4ea572b0b6e24d1d9e153f720137c380236d5394..55ae06990416002fd9d377812eb9abb2a25a2c69 100644
--- a/packages/component-faraday-ui/src/contextualBoxes/AssignHE.js
+++ b/packages/component-faraday-ui/src/contextualBoxes/AssignHE.js
@@ -30,7 +30,11 @@ const AssignHE = ({
 }) => (
   <Root pb={2}>
     <TextContainer>
-      <TextField onChange={changeSearch} value={searchValue} />
+      <TextField
+        onChange={changeSearch}
+        placeholder="Filter by name or email"
+        value={searchValue}
+      />
       <IconButton
         icon="x-circle"
         iconSize={2}
@@ -67,7 +71,8 @@ const AssignHE = ({
             <Item flex={1}>
               <OpenModal
                 onConfirm={inviteHandlingEditor(he)}
-                title="Are you sure you want to invite this HE?"
+                subtitle={he.name}
+                title="Are you sure you want to invite Handling Editor?"
               >
                 {showModal => (
                   <CustomButton onClick={showModal} size="small">
@@ -91,6 +96,7 @@ export default compose(
     handlingEditors: handlingEditors.map(he => ({
       ...he,
       name: `${he.firstName} ${he.lastName}`,
+      searchIndex: `${he.firstName} ${he.lastName} ${he.email}`,
     })),
   })),
   withStateHandlers(
@@ -106,7 +112,7 @@ export default compose(
   ),
   withProps(({ searchValue, handlingEditors = [] }) => ({
     handlingEditors: handlingEditors.filter(he =>
-      he.name.toLowerCase().startsWith(searchValue),
+      he.searchIndex.toLowerCase().includes(searchValue),
     ),
   })),
   withHandlers({