diff --git a/src/pages/addUserFlow/addUser/components/AddUserForm/AddUserForm.tsx b/src/pages/addUserFlow/addUser/components/AddUserForm/AddUserForm.tsx
index c7a76c1..28c2283 100644
--- a/src/pages/addUserFlow/addUser/components/AddUserForm/AddUserForm.tsx
+++ b/src/pages/addUserFlow/addUser/components/AddUserForm/AddUserForm.tsx
@@ -436,7 +436,7 @@ export default function AddUserForm({
                     sx={{ marginBottom: 2 }}
                     value={value}
                     disabled
-                    control={<Radio />}
+                    control={<Radio disabled />}
                     label={
                       <RadioOptionLabel
                         titleKey={titleKey}
@@ -446,11 +446,13 @@ export default function AddUserForm({
                       />
                     }
                     aria-label={t(titleKey)}
+                    /*
                     onClick={async () => {
                       // TODO set isAddINBulkEAFlow only for role admin not operator
                       setIsAddInBulkEAFlow(value);
                       await formik.setFieldValue('toAddOnAggregates', value, true);
                     }}
+                    */
                   />
                 ))}
               </RadioGroup>
diff --git a/src/pages/dashboardUsers/UsersPage/UsersPage.tsx b/src/pages/dashboardUsers/UsersPage/UsersPage.tsx
index 20921f2..fb045f9 100644
--- a/src/pages/dashboardUsers/UsersPage/UsersPage.tsx
+++ b/src/pages/dashboardUsers/UsersPage/UsersPage.tsx
@@ -78,7 +78,7 @@ function UsersPage({ party, activeProducts, productsMap, productsRolesMap }: Rea
 
   const buttonRef = useRef<HTMLButtonElement>(null);
 
-  useFocus(buttonRef, []);
+  useFocus(buttonRef, buttonRef.current);
 
   useEffect(() => {
     setFilters(emptyFilters);