diff --git a/src/components/Users/user-add.modal.js b/src/components/Users/user-add.modal.js
index dd910dc8..58b68d20 100644
--- a/src/components/Users/user-add.modal.js
+++ b/src/components/Users/user-add.modal.js
@@ -46,14 +46,17 @@ const UserAddModalContent = ({ projectId, addNewProjectMember, onMemberInvited,
 
     try {
       if (userPermissionToAdd === PROJECT_ROLES.COPILOT) {
-        const { success: invitations = [], failed } = await inviteUserToProject(projectId, {
+        const { success: invitations = [], failed, ...rest } = await inviteUserToProject(projectId, {
           handles: [userToAdd.handle],
           role: userPermissionToAdd
         })
         if (failed) {
-          const error = get(failed, '0.message', 'Unable to invite user')
+          const error = get(failed, '0.message', 'User cannot be invited')
           setAddUserError(error)
           setIsAdding(false)
+        } else if (rest.message) {
+          setAddUserError(rest.message)
+          setIsAdding(false)
         } else {
           onMemberInvited(invitations[0] || {})
           onClose()
diff --git a/src/containers/Users/index.js b/src/containers/Users/index.js
index 4cfb85f6..08ee1f01 100644
--- a/src/containers/Users/index.js
+++ b/src/containers/Users/index.js
@@ -90,7 +90,7 @@ class Users extends Component {
         projectMembers,
         invitedMembers: invitedMembers.map(m => ({
           ...m,
-          email: m.email || invitedUsers[m.userId].email
+          email: m.email || invitedUsers[m.userId].handle
         }))
       })
       const { loggedInUser } = this.props