diff --git a/web/src/components/iam/groups/AppGroups.spec.ts b/web/src/components/iam/groups/AppGroups.spec.ts
index 10af3c62bb..cdd1ff3221 100644
--- a/web/src/components/iam/groups/AppGroups.spec.ts
+++ b/web/src/components/iam/groups/AppGroups.spec.ts
@@ -256,14 +256,17 @@ describe("AppGroups Component", () => {
     it("navigates to edit page when edit icon is clicked", async () => {
       const routerPushSpy = vi.spyOn(router, "push").mockResolvedValue(undefined as any);
       const testGroup = { group_name: "test-group" };
-      
+
       await wrapper.vm.editGroup(testGroup);
-      
+
       expect(routerPushSpy).toHaveBeenCalledWith({
         name: "editGroup",
         params: {
           group_name: "test-group",
         },
+        query: {
+          org_identifier: store.state.selectedOrganization.identifier,
+        },
       });
     });
 
diff --git a/web/src/components/iam/groups/AppGroups.vue b/web/src/components/iam/groups/AppGroups.vue
index 39688f7fd9..424f1f42bb 100644
--- a/web/src/components/iam/groups/AppGroups.vue
+++ b/web/src/components/iam/groups/AppGroups.vue
@@ -215,6 +215,9 @@ const editGroup = (group: any) => {
     params: {
       group_name: group.group_name,
     },
+    query: {
+      org_identifier: store.state.selectedOrganization.identifier,
+    },
   });
 };
 
diff --git a/web/src/components/iam/groups/EditGroup.spec.ts b/web/src/components/iam/groups/EditGroup.spec.ts
index c5b7e4c471..a4921a4f59 100644
--- a/web/src/components/iam/groups/EditGroup.spec.ts
+++ b/web/src/components/iam/groups/EditGroup.spec.ts
@@ -431,10 +431,15 @@ describe("EditGroup Component", () => {
   describe("Navigation", () => {
     it("navigates back to groups page when cancel is clicked", async () => {
       const routerPushSpy = vi.spyOn(router, "push").mockResolvedValue(undefined as any);
-      
+
       await wrapper.vm.cancelEditGroup();
-      
-      expect(routerPushSpy).toHaveBeenCalledWith({ name: "groups" });
+
+      expect(routerPushSpy).toHaveBeenCalledWith({
+        name: "groups",
+        query: {
+          org_identifier: store.state.selectedOrganization.identifier
+        }
+      });
     });
 
     it("triggers navigation when cancel button is clicked", async () => {
diff --git a/web/src/components/iam/groups/EditGroup.vue b/web/src/components/iam/groups/EditGroup.vue
index 5bf23c5312..2e26140c2c 100644
--- a/web/src/components/iam/groups/EditGroup.vue
+++ b/web/src/components/iam/groups/EditGroup.vue
@@ -241,7 +241,14 @@ const saveGroupChanges = () => {
 };
 
 const cancelEditGroup = () => {
-  router.push({ name: "groups" });
+  router.push(
+    { name: "groups", 
+    query: 
+      { 
+        org_identifier: store.state.selectedOrganization.identifier 
+      }
+    }
+  );
 };
 </script>
 
diff --git a/web/src/components/iam/roles/AppRoles.vue b/web/src/components/iam/roles/AppRoles.vue
index 65aea9386a..ff51b97231 100644
--- a/web/src/components/iam/roles/AppRoles.vue
+++ b/web/src/components/iam/roles/AppRoles.vue
@@ -214,6 +214,9 @@ const editRole = (role: any) => {
     params: {
       role_name: role.role_name,
     },
+    query:{
+      org_identifier: store.state.selectedOrganization.identifier
+    }
   });
 };
 
diff --git a/web/src/components/iam/roles/EditRole.spec.js b/web/src/components/iam/roles/EditRole.spec.js
index 6e08c1ff7d..af49d10884 100644
--- a/web/src/components/iam/roles/EditRole.spec.js
+++ b/web/src/components/iam/roles/EditRole.spec.js
@@ -314,7 +314,12 @@ describe('EditRole - save and cancel', () => {
     const wrapper = await mountEditRole();
     const spy = vi.spyOn(router, 'push');
     await wrapper.vm.cancelPermissionsUpdate();
-    expect(spy).toHaveBeenCalledWith({ name: 'roles' });
+    expect(spy).toHaveBeenCalledWith({
+      name: 'roles',
+      query: {
+        org_identifier: store.state.selectedOrganization.identifier
+      }
+    });
   });
 
   it('saveRole notifies info when no changes', async () => {
diff --git a/web/src/components/iam/roles/EditRole.vue b/web/src/components/iam/roles/EditRole.vue
index 9c16ebbeee..da7deda5d0 100644
--- a/web/src/components/iam/roles/EditRole.vue
+++ b/web/src/components/iam/roles/EditRole.vue
@@ -830,7 +830,13 @@ const decodePermission = (permission: string) => {
 };
 
 const cancelPermissionsUpdate = () => {
-  router.push({ name: "roles" });
+  router.push(
+    { name: "roles",
+    query: {
+        org_identifier: store.state.selectedOrganization.identifier,
+        }
+     } 
+);
 };
 
 const handlePermissionChange = (row: any, permission: string) => {
diff --git a/web/src/components/reports/ReportList.spec.js b/web/src/components/reports/ReportList.spec.js
index 4c5d05061f..190ac51b31 100644
--- a/web/src/components/reports/ReportList.spec.js
+++ b/web/src/components/reports/ReportList.spec.js
@@ -670,7 +670,10 @@ describe("ReportList Component", () => {
       await addButton.trigger('click');
 
       expect(mockRouter.push).toHaveBeenCalledWith({
-        name: "createReport"
+        name: "createReport",
+        query: {
+          org_identifier: store.state.selectedOrganization.identifier
+        }
       });
     });
   });
diff --git a/web/src/components/reports/ReportList.vue b/web/src/components/reports/ReportList.vue
index 0500549aad..b38d3b753e 100644
--- a/web/src/components/reports/ReportList.vue
+++ b/web/src/components/reports/ReportList.vue
@@ -500,7 +500,7 @@ const createNewReport = () => {
     button: "Add Report",
     page: "Reports"
   });
-  router.push({ name: "createReport" });
+  router.push({ name: "createReport", query: { org_identifier: store.state.selectedOrganization.identifier } });
 };
 
 const filterReports = () => {