diff --git a/packages/console/src/pages/Organizations/Guide/CreatePermissions/index.tsx b/packages/console/src/pages/Organizations/Guide/CreatePermissions/index.tsx
index d28129cbb..8b11a5a92 100644
--- a/packages/console/src/pages/Organizations/Guide/CreatePermissions/index.tsx
+++ b/packages/console/src/pages/Organizations/Guide/CreatePermissions/index.tsx
@@ -68,29 +68,28 @@ function CreatePermissions() {
 
   const { fields, append, remove } = useFieldArray({ control, name: 'permissions' });
 
-  const onSubmit = () => {
-    if (!isDirty) {
-      navigate(`../${steps.createRoles}`);
-      return;
-    }
-
-    void handleSubmit(
-      trySubmitSafe(async ({ permissions }) => {
-        if (data?.length) {
-          await Promise.all(
-            data.map(async ({ id }) => api.delete(`${organizationScopesPath}/${id}`))
-          );
-        }
-        await Promise.all(
-          permissions.map(async ({ name, description }) => {
-            await api.post(organizationScopesPath, { json: { name, description } });
-          })
-        );
-
+  const onSubmit = handleSubmit(
+    trySubmitSafe(async ({ permissions }) => {
+      // If user has pre-saved data and no changes, skip submit and go directly to next step
+      if (data?.length && !isDirty) {
         navigate(`../${steps.createRoles}`);
-      })
-    )();
-  };
+        return;
+      }
+
+      if (data?.length) {
+        await Promise.all(
+          data.map(async ({ id }) => api.delete(`${organizationScopesPath}/${id}`))
+        );
+      }
+      await Promise.all(
+        permissions.map(async ({ name, description }) => {
+          await api.post(organizationScopesPath, { json: { name, description } });
+        })
+      );
+
+      navigate(`../${steps.createRoles}`);
+    })
+  );
 
   return (
     <>
diff --git a/packages/console/src/pages/Organizations/Guide/CreateRoles/index.tsx b/packages/console/src/pages/Organizations/Guide/CreateRoles/index.tsx
index 3c7271547..daa01c1ec 100644
--- a/packages/console/src/pages/Organizations/Guide/CreateRoles/index.tsx
+++ b/packages/console/src/pages/Organizations/Guide/CreateRoles/index.tsx
@@ -68,37 +68,34 @@ function CreateRoles() {
 
   const { fields, append, remove } = useFieldArray({ control, name: 'roles' });
 
-  const onSubmit = () => {
-    if (!isDirty) {
-      navigate(`../${steps.createOrganization}`);
-      return;
-    }
-
-    void handleSubmit(
-      trySubmitSafe(async ({ roles }) => {
-        if (data?.length) {
-          await Promise.all(
-            data.map(async ({ id }) => api.delete(`${organizationRolePath}/${id}`))
-          );
-        }
-        await Promise.all(
-          roles.map(async ({ name, description, scopes }) => {
-            const { id } = await api
-              .post(organizationRolePath, { json: { name, description } })
-              .json<OrganizationRole>();
-
-            if (scopes.length > 0) {
-              await api.put(`${organizationRolePath}/${id}/scopes`, {
-                json: { organizationScopeIds: scopes.map(({ value }) => value) },
-              });
-            }
-          })
-        );
-
+  const onSubmit = handleSubmit(
+    trySubmitSafe(async ({ roles }) => {
+      // If user has pre-saved data and no changes, skip submit and go directly to next step
+      if (data?.length && !isDirty) {
         navigate(`../${steps.createOrganization}`);
-      })
-    )();
-  };
+        return;
+      }
+
+      if (data?.length) {
+        await Promise.all(data.map(async ({ id }) => api.delete(`${organizationRolePath}/${id}`)));
+      }
+      await Promise.all(
+        roles.map(async ({ name, description, scopes }) => {
+          const { id } = await api
+            .post(organizationRolePath, { json: { name, description } })
+            .json<OrganizationRole>();
+
+          if (scopes.length > 0) {
+            await api.put(`${organizationRolePath}/${id}/scopes`, {
+              json: { organizationScopeIds: scopes.map(({ value }) => value) },
+            });
+          }
+        })
+      );
+
+      navigate(`../${steps.createOrganization}`);
+    })
+  );
 
   const onNavigateBack = () => {
     reset();