diff --git a/backend/celerybeat-schedule b/backend/celerybeat-schedule
new file mode 100644
index 00000000..695dce4c
Binary files /dev/null and b/backend/celerybeat-schedule differ
diff --git a/frontend/src/lib/components/dashboard/customs_brokers/create-dialog.svelte b/frontend/src/lib/components/dashboard/customs_brokers/create-dialog.svelte
index 44bca734..672f019a 100644
--- a/frontend/src/lib/components/dashboard/customs_brokers/create-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/customs_brokers/create-dialog.svelte
@@ -275,7 +275,7 @@
 				<div class="grid grid-cols-4 gap-4">
 					<div class="space-y-2">
 						<Label for="postal_code">C.P.</Label>
-						<Input id="postal_code" bind:value={formData.postal_code} disabled={loading} />
+						<Input id="postal_code" bind:value={formData.postal_code} disabled={loading} oninput={(e) => { formData.postal_code = e.currentTarget.value.replace(/[^a-zA-Z0-9]/g, ''); }} />
 					</div>
 					<div class="space-y-2 col-span-2">
 						<Label for="city">Ciudad</Label>
diff --git a/frontend/src/lib/components/dashboard/customs_brokers/edit-dialog.svelte b/frontend/src/lib/components/dashboard/customs_brokers/edit-dialog.svelte
index 147df888..294c7515 100644
--- a/frontend/src/lib/components/dashboard/customs_brokers/edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/customs_brokers/edit-dialog.svelte
@@ -318,6 +318,7 @@
 							placeholder="C.P."
 							maxlength={15}
 							disabled={loading}
+							oninput={(e) => { formData.postal_code = e.currentTarget.value.replace(/[^a-zA-Z0-9]/g, ''); }}
 						/>
 					</div>
 
diff --git a/frontend/src/routes/dashboard/customs_brokers/edit/[[id]]/+page.svelte b/frontend/src/routes/dashboard/customs_brokers/edit/[[id]]/+page.svelte
index 801303a2..c52512ae 100644
--- a/frontend/src/routes/dashboard/customs_brokers/edit/[[id]]/+page.svelte
+++ b/frontend/src/routes/dashboard/customs_brokers/edit/[[id]]/+page.svelte
@@ -199,7 +199,9 @@
 	}
 
 	function handleStateSelect(state: any) {
-		formData.state = state.m3_key || state.mex_key || state.ame_key;
+		// Mostrar en Estado la clave del estado (mex_key/ame_key), no el país (m3_key)
+		formData.state = state.mex_key || state.ame_key || state.m3_key;
+		if (state.m3_key) formData.country = state.m3_key;
 	}
 
 	// --- 4. GUARDADO ---
@@ -538,6 +540,7 @@
 										placeholder="32000"
 										disabled={loading}
 										class="h-10"
+										oninput={(e) => { formData.postal_code = e.currentTarget.value.replace(/[^a-zA-Z0-9]/g, ''); }}
 									/>
 								</div>
 								<div class="grid gap-2 md:col-span-2">