diff --git a/frontend/src/lib/api/dashboard/admin/role-permissions.ts b/frontend/src/lib/api/dashboard/admin/role-permissions.ts
index 208ed61..ef057f7 100644
--- a/frontend/src/lib/api/dashboard/admin/role-permissions.ts
+++ b/frontend/src/lib/api/dashboard/admin/role-permissions.ts
@@ -48,7 +48,11 @@ export const rolePermissionsAPI = {
 		companyId: number,
 		data: AssignPermissionData
 	): Promise<RolePermission> {
-		const response = await api.post(`/v1/core/permissions/roles/${roleId}/permissions?company_id=${companyId}`, data);
+		// El backend recibe permission_id como query param (no en el body).
+		const response = await api.post(
+			`/v1/core/permissions/roles/${roleId}/permissions?permission_id=${data.permission_id}&company_id=${companyId}`,
+			{}
+		);
 		return response.data;
 	},
 
diff --git a/frontend/src/routes/dashboard/roles/+page.svelte b/frontend/src/routes/dashboard/roles/+page.svelte
index 0f60673..729ebd8 100644
--- a/frontend/src/routes/dashboard/roles/+page.svelte
+++ b/frontend/src/routes/dashboard/roles/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import { onMount, onDestroy } from 'svelte';
 	import { Shield, Plus, Trash2, ChevronRight, ChevronDown } from '@lucide/svelte';
 	import * as Card from '$lib/components/ui/card';
 	import { Button } from '$lib/components/ui/button';
@@ -57,18 +56,19 @@
 		}
 	}
 
-	function onCompanyChanged() {
+	// Recarga los roles cuando cambia la compañía activa —incluida la hidratación
+	// inicial tras refrescar (en onMount el store aún no tenía compañía, por eso
+	// antes no aparecían hasta re-seleccionarla).
+	$effect(() => {
+		const id = companyId;
 		expandedRoleId = null;
 		rolePerms = {};
-		void load();
-	}
-
-	onMount(() => {
-		void load();
-		if (typeof window !== 'undefined') window.addEventListener('companyChanged', onCompanyChanged);
-	});
-	onDestroy(() => {
-		if (typeof window !== 'undefined') window.removeEventListener('companyChanged', onCompanyChanged);
+		if (id) {
+			void load();
+		} else {
+			roles = [];
+			loading = false;
+		}
 	});
 
 	async function createRole() {
@@ -136,6 +136,7 @@
 				rolePerms[roleId]?.delete(perm.id);
 			}
 			rolePerms = { ...rolePerms };
+			toast.success(checked ? 'Permiso agregado' : 'Permiso quitado');
 		} catch (e) {
 			toast.error('No se pudo actualizar el permiso');
 		} finally {
diff --git a/frontend/src/routes/dashboard/users/+page.svelte b/frontend/src/routes/dashboard/users/+page.svelte
index 67f14a9..4aec654 100644
--- a/frontend/src/routes/dashboard/users/+page.svelte
+++ b/frontend/src/routes/dashboard/users/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import { onMount, onDestroy } from 'svelte';
 	import { Users, X, UserPlus, Copy, Check } from '@lucide/svelte';
 	import { Button } from '$lib/components/ui/button';
 	import * as Card from '$lib/components/ui/card';
@@ -61,15 +60,16 @@
 		}
 	}
 
-	function onCompanyChanged() {
-		void load();
-	}
-	onMount(() => {
-		void load();
-		if (typeof window !== 'undefined') window.addEventListener('companyChanged', onCompanyChanged);
-	});
-	onDestroy(() => {
-		if (typeof window !== 'undefined') window.removeEventListener('companyChanged', onCompanyChanged);
+	// Recarga al cambiar la compañía activa —incluida la hidratación inicial tras
+	// refrescar (antes no cargaba hasta re-seleccionar la compañía).
+	$effect(() => {
+		const id = companyId;
+		if (id) {
+			void load();
+		} else {
+			users = [];
+			loading = false;
+		}
 	});
 
 	async function assignRole(user: User, roleIdRaw: string) {