diff --git a/ui/src/components/Modals/AddUserModal/AddUserModal.tsx b/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
index 5fe27d1d0..b61a36969 100644
--- a/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
+++ b/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
@@ -32,7 +32,6 @@ export const AddUserModal: FC<AddUserModalProps> = ({isOpen, onCloseModal, userD
   //const [editUserData, setEditUserData] = useState(userData)
   const [searchValue, setSearchValue] = useState("");
   const [workspaces, setWorkspaces] = useState([]);
-  const [checkedWorkspaceKeys, setCheckedWorkspaceKeys] = useState([]);
   //const { control, handleSubmit,register } = useForm<UserData>();
   const [disable, setDisable] = useState(true);
   const [editMode, setEditMode] = useState(isEditMode);
@@ -104,9 +103,8 @@ export const AddUserModal: FC<AddUserModalProps> = ({isOpen, onCloseModal, userD
 
   const workspaceChange = (workspaces) => {
     //setWorkspaces(newVal);
-    const selectedWorksapce = workspaces.find(x=> x.isChecked)
-    const  data = {...userDataModel, workspaceId : selectedWorksapce.key}
-    setUserData(data)
+    const  data = {...userDataModel, workspaceId : workspaces.length ? workspaces[0] : ""}
+    setUserData((prevState) => {return data});
     setGenarateDisabledState()
   }
 
@@ -258,7 +256,7 @@ export const AddUserModal: FC<AddUserModalProps> = ({isOpen, onCloseModal, userD
                     onChange={(event) => setSearchValue(event.target.value)}/>
         </div>
         <SelectList items={workspaces} tableName={''} multiSelect={false} searchValue={searchValue}
-        setCheckedValues={workspaceChange} tabelClassName={''} checkedValues={[]} >
+        setCheckedValues={workspaceChange} tabelClassName={''} checkedValues={[userDataModel.workspaceId]} >
         </SelectList>
       </div>
 
diff --git a/ui/src/components/UI/SelectList.tsx b/ui/src/components/UI/SelectList.tsx
index c1ac426c4..5bb7d7856 100644
--- a/ui/src/components/UI/SelectList.tsx
+++ b/ui/src/components/UI/SelectList.tsx
@@ -25,13 +25,20 @@ const SelectList: React.FC<Props> = ({items ,tableName,checkedValues=[],multiSel
 
     const toggleValue = (checkedKey) => {
         if (!multiSelect){
-            unToggleAll();
+            // unToggleAll();
+            const newCheckedValues = [];
+            newCheckedValues.push(checkedKey);
+            setCheckedValues(newCheckedValues);
+        }
+        else {
+            const newCheckedValues = [...checkedValues];
+            let index = newCheckedValues.indexOf(checkedKey);
+            if(index > -1) 
+                newCheckedValues.splice(index,1);
+            else 
+                newCheckedValues.push(checkedKey);   
+            setCheckedValues(newCheckedValues);
         }
-        const newCheckedValues = [...checkedValues];
-        let index = newCheckedValues.indexOf(checkedKey);
-        if(index > -1) newCheckedValues.splice(index,1);
-        else newCheckedValues.push(checkedKey);   
-        setCheckedValues(newCheckedValues);
     }
 
     const unToggleAll = () => {