diff --git a/src/lib/components/signup-form.svelte b/src/lib/components/signup-form.svelte
index 2b102af..e21e58c 100644
--- a/src/lib/components/signup-form.svelte
+++ b/src/lib/components/signup-form.svelte
@@ -11,25 +11,39 @@
 
 	import Spinner from './ui/spinner/spinner.svelte';
 	import { checkUsername } from '@/hooks/checkUsername';
+	import { checkEmail } from '@/hooks/checkEmail';
 
 	let { showAlert = $bindable() } = $props();
 
 	let cargando = $state(false);
 
+	let repetirContraseña = $state('');
+
 	let checkeandoUsuario: boolean | null = $state(null);
 	let esUsuarioValido = $state(false);
 
+	let checkeandoEmail: boolean | null = $state(null);
+	let esEmailValido = $state(false);
+
 	async function checkUsuario() {
 		checkeandoUsuario = true;
 		esUsuarioValido = await checkUsername(dto.username);
 		checkeandoUsuario = false;
 	}
 
+	async function checkEmaill() {
+		checkeandoEmail = true;
+		esEmailValido = await checkEmail(dto.email);
+		checkeandoEmail = false;
+	}
 	const setAlert = () => (showAlert = true);
 
 	let dto: RegisterDto = $state({ password: '', username: '', email: '', displayName: '' });
 
 	const handleSubmit = async (e: SubmitEvent) => {
+		if (esUsuarioValido == false) return;
+		if (repetirContraseña !== dto.password) return;
+
 		cargando = true;
 		await register(e, dto, setAlert);
 		cargando = false;
@@ -73,13 +87,25 @@
 				</Field.Field>
 
 				<Field.Field>
-					<Field.Label for="email">Email</Field.Label>
+					<div class="flex justify-between">
+						<Field.Label for="email">Email</Field.Label>
+						{#if checkeandoEmail == null}
+							<div hidden></div>
+						{:else if checkeandoEmail == true}
+							<Spinner></Spinner>
+						{:else if esEmailValido}
+							<Check class="text-green-500" />
+						{:else}
+							<Cross class="text-red-500" />
+						{/if}
+					</div>
 					<Input
 						id="email"
 						type="email"
 						bind:value={dto.email}
 						placeholder="m@ejemplo.com"
 						required
+						onchange={checkEmaill}
 					/>
 				</Field.Field>
 				<Field.Field>
@@ -89,7 +115,7 @@
 				</Field.Field>
 				<Field.Field>
 					<Field.Label for="confirm-password">Confirmar Contraseña</Field.Label>
-					<Input id="confirm-password" type="password" required />
+					<Input id="confirm-password" type="password" required bind:value={repetirContraseña} />
 					<Field.Description>Confirma la contraseña</Field.Description>
 				</Field.Field>
 				<Field.Group>
diff --git a/src/lib/hooks/checkEmail.ts b/src/lib/hooks/checkEmail.ts
new file mode 100644
index 0000000..2bbc8e8
--- /dev/null
+++ b/src/lib/hooks/checkEmail.ts
@@ -0,0 +1,16 @@
+import { apiBase } from "@/stores/url";
+import { get } from "svelte/store";
+
+export async function checkEmail(email: string) {
+  try {
+    const req = await fetch(`${get(apiBase)}/api/users/check-email/${email}`, {
+      method: "GET"
+    });
+    if (req.ok){
+      return (await req.json()).available;
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}