diff --git a/src/app/[orgId]/settings/clients/create/page.tsx b/src/app/[orgId]/settings/clients/machine/create/page.tsx
similarity index 100%
rename from src/app/[orgId]/settings/clients/create/page.tsx
rename to src/app/[orgId]/settings/clients/machine/create/page.tsx
diff --git a/src/app/[orgId]/settings/resources/create/page.tsx b/src/app/[orgId]/settings/resources/proxy/create/page.tsx
similarity index 100%
rename from src/app/[orgId]/settings/resources/create/page.tsx
rename to src/app/[orgId]/settings/resources/proxy/create/page.tsx
diff --git a/src/components/MachineClientsTable.tsx b/src/components/MachineClientsTable.tsx
index 1d6dc175..851f693b 100644
--- a/src/components/MachineClientsTable.tsx
+++ b/src/components/MachineClientsTable.tsx
@@ -414,7 +414,7 @@ export default function MachineClientsTable({
                 searchPlaceholder={t("resourcesSearch")}
                 searchColumn="name"
                 onAdd={() =>
-                    router.push(`/${orgId}/settings/clients/create`)
+                    router.push(`/${orgId}/settings/clients/machine/create`)
                 }
                 addButtonText={t("createClient")}
                 onRefresh={refreshData}
diff --git a/src/components/ProxyResourcesTable.tsx b/src/components/ProxyResourcesTable.tsx
index 8cce2e06..0e86874c 100644
--- a/src/components/ProxyResourcesTable.tsx
+++ b/src/components/ProxyResourcesTable.tsx
@@ -554,7 +554,7 @@ export default function ProxyResourcesTable({
                 searchPlaceholder={t("resourcesSearch")}
                 searchColumn="name"
                 onAdd={() =>
-                    router.push(`/${orgId}/settings/resources/create`)
+                    router.push(`/${orgId}/settings/resources/proxy/create`)
                 }
                 addButtonText={t("resourceAdd")}
                 onRefresh={refreshData}