diff --git a/packages/component-faraday-ui/src/PersonInvitation.js b/packages/component-faraday-ui/src/PersonInvitation.js
index 5199bdce0043d8f313de8225d3b570ed07b2303c..563573c38875e01e88d532f813c9f57cb92b522c 100644
--- a/packages/component-faraday-ui/src/PersonInvitation.js
+++ b/packages/component-faraday-ui/src/PersonInvitation.js
@@ -14,42 +14,43 @@ const PersonInvitation = ({
 }) => (
   <Root {...rest}>
     <Text>{name}</Text>
-    {!hasAnswer && (
-      <Fragment>
-        <OpenModal
-          isFetching={isFetching}
-          onConfirm={resendInvitation}
-          title="Are you sure you want to resend the invitation?"
-        >
-          {showModal => (
-            <IconButton
-              icon="refresh-cw"
-              iconSize={2}
-              ml={2}
-              onClick={showModal}
-              secondary
-            />
-          )}
-        </OpenModal>
-        <OpenModal
-          confirmText="Remove invite"
-          isFetching={isFetching}
-          onConfirm={revokeInvitation}
-          subtitle="Clicking ‘Remove’ will allow you to invite a different Handling Editor"
-          title="Remove invitation to Handling Editor?"
-        >
-          {showModal => (
-            <IconButton
-              icon="x-circle"
-              iconSize={2}
-              ml={2}
-              onClick={showModal}
-              secondary
-            />
-          )}
-        </OpenModal>
-      </Fragment>
-    )}
+    {!hasAnswer &&
+      name !== 'Unassigned' && (
+        <Fragment>
+          <OpenModal
+            isFetching={isFetching}
+            onConfirm={resendInvitation}
+            title="Are you sure you want to resend the invitation?"
+          >
+            {showModal => (
+              <IconButton
+                icon="refresh-cw"
+                iconSize={2}
+                ml={2}
+                onClick={showModal}
+                secondary
+              />
+            )}
+          </OpenModal>
+          <OpenModal
+            confirmText="Remove invite"
+            isFetching={isFetching}
+            onConfirm={revokeInvitation}
+            subtitle="Clicking ‘Remove’ will allow you to invite a different Handling Editor"
+            title="Remove invitation to Handling Editor?"
+          >
+            {showModal => (
+              <IconButton
+                icon="x-circle"
+                iconSize={2}
+                ml={2}
+                onClick={showModal}
+                secondary
+              />
+            )}
+          </OpenModal>
+        </Fragment>
+      )}
   </Root>
 )
 
diff --git a/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js b/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js
index 8600264137cbb4fdbc8d1d588b6f3b3a27eefb37..c7817167d36f538b3fed2c88ddb51eba0ece61c1 100644
--- a/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js
+++ b/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js
@@ -253,7 +253,7 @@ const sendAuthorsEmail = async ({
       email.content.ctaText = 'MANUSCRIPT DETAILS'
     } else if (author.isConfirmed) {
       email.content.ctaLink = services.createUrl(baseUrl, '')
-      email.content.ctaText = 'LOGIN'
+      email.content.ctaText = 'LOG IN'
     } else {
       email.content.ctaLink = services.createUrl(baseUrl, resetPath, {
         email: author.email,
diff --git a/packages/component-user-manager/src/routes/fragmentsUsers/emails/notifications.js b/packages/component-user-manager/src/routes/fragmentsUsers/emails/notifications.js
index 674e9d8dcf2b562628d055321d7ce33fcbb8dfec..71e544c00e30d2d1aa5cd894698484357c98a9d7 100644
--- a/packages/component-user-manager/src/routes/fragmentsUsers/emails/notifications.js
+++ b/packages/component-user-manager/src/routes/fragmentsUsers/emails/notifications.js
@@ -39,7 +39,7 @@ module.exports = {
         name: `${submittingAuthor.lastName}`,
       },
       content: {
-        ctaText: 'LOGIN',
+        ctaText: 'LOG IN',
         signatureJournal: journalName,
         subject: `Manuscript submitted`,
         ctaLink: services.createUrl(baseUrl, ''),
diff --git a/packages/component-user-manager/src/routes/users/get.js b/packages/component-user-manager/src/routes/users/get.js
index 3fff1dbd4d6d17123b7710c4676d39fdaa25fd8d..32e0f55d89b2c60dab3e64b7813abd7dc2f8c754 100644
--- a/packages/component-user-manager/src/routes/users/get.js
+++ b/packages/component-user-manager/src/routes/users/get.js
@@ -2,6 +2,8 @@ const {
   authsome: authsomeHelper,
 } = require('pubsweet-component-helper-service')
 
+const { createFilterFromQuery } = require('pubsweet-server/src/routes/util')
+
 module.exports = models => async (req, res) => {
   const authsome = authsomeHelper.getAuthsome(models)
   const target = {
@@ -16,5 +18,7 @@ module.exports = models => async (req, res) => {
     })
   }
 
-  return res.status(200).json({ users: parsedUsers })
+  const filteredUsers = parsedUsers.filter(createFilterFromQuery(req.query))
+
+  return res.status(200).json({ users: filteredUsers })
 }
diff --git a/packages/components-faraday/src/components/Admin/utils.js b/packages/components-faraday/src/components/Admin/utils.js
index 1c91cb462bd6ae5c21d50b94dfa9955241dccecd..bbea0fd9095e78086b3c366b627ad9844e0a21bd 100644
--- a/packages/components-faraday/src/components/Admin/utils.js
+++ b/packages/components-faraday/src/components/Admin/utils.js
@@ -9,7 +9,7 @@ const generatePasswordHash = () =>
   ).join('')
 
 export const setAdmin = values => {
-  const newValues = { ...values }
+  const newValues = { ...values, isActive: true }
   if (newValues.roles && newValues.roles.includes('admin')) {
     newValues.admin = true
   } else {