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 c34de920..c7fd69d3 100644
--- a/frontend/src/lib/components/dashboard/customs_brokers/create-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/customs_brokers/create-dialog.svelte
@@ -196,6 +196,7 @@
 			</Dialog.Description>
 		</Dialog.Header>
 
+		<form autocomplete="off" onsubmit={(e) => e.preventDefault()}>
 		<div class="grid gap-6 py-4">
 			<div class="space-y-4">
 				<h4 class="text-sm leading-none font-medium text-muted-foreground">Identificación</h4>
@@ -404,6 +405,7 @@
 				</div>
 			</div>
 		</div>
+		</form>
 
 		<Dialog.Footer>
 			<Button variant="outline" onclick={() => (open = false)} disabled={loading}>Cancelar</Button>
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 fa98ecc3..e78104fa 100644
--- a/frontend/src/lib/components/dashboard/customs_brokers/edit-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/customs_brokers/edit-dialog.svelte
@@ -183,7 +183,7 @@
 			</Dialog.Description>
 		</Dialog.Header>
 
-		<form onsubmit={handleSubmit} class="space-y-6">
+		<form onsubmit={handleSubmit} autocomplete="off" class="space-y-6">
 			{#if error}
 				<div
 					class="rounded-lg border border-destructive bg-destructive/10 p-3 text-sm text-destructive"
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 021b34e2..eb598545 100644
--- a/frontend/src/routes/dashboard/customs_brokers/edit/[[id]]/+page.svelte
+++ b/frontend/src/routes/dashboard/customs_brokers/edit/[[id]]/+page.svelte
@@ -459,6 +459,7 @@
 				e.preventDefault();
 				handleSave();
 			}}
+			autocomplete="off"
 		>
 			<!-- Tab: General -->
 			<Tabs.Content value="general">