diff --git a/web/settings/relationship/add-users-list.react.js b/web/settings/relationship/add-users-list.react.js
index 4024d2c3a..6a0b3b324 100644
--- a/web/settings/relationship/add-users-list.react.js
+++ b/web/settings/relationship/add-users-list.react.js
@@ -1,49 +1,75 @@
 // @flow
 
 import * as React from 'react';
 
 import { searchUsers } from 'lib/actions/user-actions.js';
 import { userStoreSearchIndex as userStoreSearchIndexSelector } from 'lib/selectors/user-selectors.js';
 import type { GlobalAccountUserInfo } from 'lib/types/user-types.js';
 import { useServerCall } from 'lib/utils/action-utils.js';
 
 import { useSelector } from '../../redux/redux-utils.js';
 
 type Props = {
   +searchText: string,
 };
 
 function AddUsersList(props: Props): React.Node {
   const { searchText } = props;
 
   const userStoreSearchIndex = useSelector(userStoreSearchIndexSelector);
-  // eslint-disable-next-line no-unused-vars
   const [userStoreSearchResults, setUserStoreSearchResults] = React.useState<
     $ReadOnlySet<string>,
   >(new Set(userStoreSearchIndex.getSearchResults(searchText)));
   React.useEffect(() => {
     setUserStoreSearchResults(
       new Set(userStoreSearchIndex.getSearchResults(searchText)),
     );
   }, [searchText, userStoreSearchIndex]);
 
-  // eslint-disable-next-line no-unused-vars
   const [serverSearchResults, setServerSearchResults] = React.useState<
     $ReadOnlyArray<GlobalAccountUserInfo>,
   >([]);
   const callSearchUsers = useServerCall(searchUsers);
   React.useEffect(() => {
     (async () => {
       if (searchText.length === 0) {
         setServerSearchResults([]);
       } else {
         const { userInfos } = await callSearchUsers(searchText);
         setServerSearchResults(userInfos);
       }
     })();
   }, [callSearchUsers, searchText]);
 
+  const searchTextPresent = searchText.length > 0;
+  const userInfos = useSelector(state => state.userStore.userInfos);
+  // eslint-disable-next-line no-unused-vars
+  const mergedUserInfos = React.useMemo(() => {
+    const mergedInfos = {};
+
+    for (const userInfo of serverSearchResults) {
+      mergedInfos[userInfo.id] = userInfo;
+    }
+
+    const userStoreUserIDs = searchTextPresent
+      ? userStoreSearchResults
+      : Object.keys(userInfos);
+    for (const id of userStoreUserIDs) {
+      const { username, relationshipStatus } = userInfos[id];
+      if (username) {
+        mergedInfos[id] = { id, username, relationshipStatus };
+      }
+    }
+
+    return mergedInfos;
+  }, [
+    searchTextPresent,
+    serverSearchResults,
+    userInfos,
+    userStoreSearchResults,
+  ]);
+
   return null;
 }
 
 export default AddUsersList;