diff --git a/client/src/components/UserMultiSelect/UserMultiSelect.tsx b/client/src/components/UserMultiSelect/UserMultiSelect.tsx
index a9f8a8c1..d88d5d38 100644
--- a/client/src/components/UserMultiSelect/UserMultiSelect.tsx
+++ b/client/src/components/UserMultiSelect/UserMultiSelect.tsx
@@ -96,6 +96,12 @@ const UserMultiSelect = (props: IUserMultiSelectProps) => {
     (a, b) => a.value === b.value,
   )
 
+  useEffect(() => {
+    if (selected.some((a) => !mergedData.some((b) => a === b.value))) {
+      setFocused(true)
+    }
+  }, [mergedData.map((row) => row.value).join(','), selected.join(',')])
+
   return (
     <MultiSelect
       data={mergedData}
diff --git a/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx b/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx
index 25b2ae1e..72d5a58f 100644
--- a/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx
+++ b/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx
@@ -133,6 +133,7 @@ const ReplaceTopicModal = (props: ICreateTopicModalProps) => {
             required
             groups={['supervisor']}
             initialUsers={topic?.supervisors}
+            maxValues={1}
             {...form.getInputProps('supervisorIds')}
           />
           <UserMultiSelect