diff --git a/ui/src/components/Modals/AddUserModal/AddUserModal.tsx b/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
index 659e84119..179ded28c 100644
--- a/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
+++ b/ui/src/components/Modals/AddUserModal/AddUserModal.tsx
@@ -31,7 +31,9 @@ export const AddUserModal: FC<AddUserModalProps> = ({isOpen, onCloseModal, userD
 
   //const [editUserData, setEditUserData] = useState(userData)
   const [searchValue, setSearchValue] = useState("");
+
   const [workspaces, setWorkspaces] = useState([])
+
   //const { control, handleSubmit,register } = useForm<UserData>();
   const [disable, setDisable] = useState(true);
   const [editMode, setEditMode] = useState(isEditMode);
@@ -49,7 +51,6 @@ export const AddUserModal: FC<AddUserModalProps> = ({isOpen, onCloseModal, userD
   useEffect(() => {
     (async () => {
         try {
-<<<<<<< HEAD
           //   const workspacesList = [
           //     {
           //         "id": "f54b18ec-aa15-4b2c-a4d5-8eda17e44c93",
@@ -64,21 +65,6 @@ export const AddUserModal: FC<AddUserModalProps> = ({isOpen, onCloseModal, userD
           const list = await api.getWorkspaces() 
           const workspacesList = list.map((obj) => {return {key:obj.id, value:obj.name,isChecked:false}})
           setWorkspaces(workspacesList)                         
-=======
-            const workspacesList = [
-              {
-                  "id": "f54b18ec-aa15-4b2c-a4d5-8eda17e44c93",
-                  "name": "sock-shop"
-              },
-              {
-                  "id": "c7ad9158-d840-46c0-b5ce-2487c013723f",
-                  "name": "test"
-              }
-          ].map((obj) => {return {key:obj.id, value:obj.name}})
-          //await api.getWorkspaces() 
-          setWorkspaces(workspacesList)    
-                          
->>>>>>> origin/feature/ui/TRA-4192_workspace_management
         } catch (e) {
             toast.error("Error finding workspaces")
         }
@@ -119,9 +105,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()
   }
 
@@ -273,7 +258,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 = () => {