diff --git a/mocks/handlers/roles.js b/mocks/handlers/roles.js
index 1c26ef5..2ab045d 100644
--- a/mocks/handlers/roles.js
+++ b/mocks/handlers/roles.js
@@ -1,5 +1,5 @@
 import {rest} from "msw";
-import {GET_ROLE_LIST, GET_ROLES} from "@/core/data/apiRoutes";
+import {GET_PERMISSIONS_LIST, GET_ROLE_LIST, GET_ROLES} from "@/core/data/apiRoutes";
 
 export const rolesHandler = [
     rest.get(GET_ROLES, (req, res, ctx) => {
@@ -51,7 +51,7 @@ export const rolesHandler = [
             ),
         );
     }),
-    rest.get(GET_ROLE_LIST, (req, res, ctx) => {
+    rest.get(GET_PERMISSIONS_LIST, (req, res, ctx) => {
         return res(ctx.json({
             data: [
                 {
diff --git a/src/components/dashboard/role-management/Form/CreateForm/CreateContent.jsx b/src/components/dashboard/role-management/Form/CreateForm/CreateContent.jsx
index 8537aab..8a8f5e7 100644
--- a/src/components/dashboard/role-management/Form/CreateForm/CreateContent.jsx
+++ b/src/components/dashboard/role-management/Form/CreateForm/CreateContent.jsx
@@ -108,12 +108,12 @@ const CreateContent = ({mutate, setOpenConfirmDialog}) => {
                                     : (
                                         <Grid container spacing={2}>
                                             <>
-                                                {permissions_list.map((permission) => (
-                                                    <Grid key={permission.id} item xs={6}>
+                                                {permissions_list.map((permission, index) => (
+                                                    <Grid key={permission.id} item xs={6} data-testid= "PermissionList-checkbox">
                                                         <FormControlLabel
                                                             control={
                                                                 <Checkbox
-                                                                    data-testid="PermissionList-checkbox"
+                                                                    data-testid= {`PermissionList-checkbox-${index}`}
                                                                     checked={formik.values.permissions.includes(permission.id)}
                                                                     onChange={(e) => {
                                                                         if (e.target.checked) {
diff --git a/src/components/dashboard/role-management/Form/CreateForm/__test__/CreateContent.test.js b/src/components/dashboard/role-management/Form/CreateForm/__test__/CreateContent.test.js
index af8842b..2733f9f 100644
--- a/src/components/dashboard/role-management/Form/CreateForm/__test__/CreateContent.test.js
+++ b/src/components/dashboard/role-management/Form/CreateForm/__test__/CreateContent.test.js
@@ -154,5 +154,24 @@ describe("Create Content component from Create Form Component in Role Management
             const submitButtonElement = screen.queryByText("ثبت")
             expect(submitButtonElement).toBeDisabled()
         });
+
+        it('should submit button be able if inputs get filled', async () => {
+            render(
+                <MockAppWithProviders>
+                    <CreateContent/>
+                </MockAppWithProviders>
+            )
+            const submitButtonElement = screen.queryByText("ثبت")
+            expect(submitButtonElement).toBeDisabled()
+            const nameElement = screen.getByLabelText("نام انگلیسی")
+            const name_faElement = screen.getByLabelText("نام فارسی")
+            const roleElement = await screen.findByTestId("PermissionList-checkbox-0");
+            fireEvent.change(nameElement, { target: { value: 'amin' } })
+            fireEvent.change(name_faElement, { target: { value: 'امین' } })
+            fireEvent.click(roleElement)
+            await waitFor(()=>{
+                expect(submitButtonElement).not.toBeDisabled()
+            })
+        });
     })
 })
\ No newline at end of file