diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index eec2ce0..20d7631 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { goto, replaceState } from '$app/navigation';
 	import Card from '@/components/ui/card/card.svelte';
 	import { Content } from '@/components/ui/card';
 	import { sesionStore } from '@/stores/usuario';
@@ -11,6 +12,9 @@
 	import { fade, slide } from 'svelte/transition';
 	import { getPosts } from '@/hooks/getPosts';
 	import Spinner from '@/components/ui/spinner/spinner.svelte';
+	import { page } from '$app/state';
+	import Dialog from '@/components/ui/dialog/dialog.svelte';
+	import DialogContent from '@/components/ui/dialog/dialog-content.svelte';
 
 	$effect(() => {
 		resetPosts();
@@ -33,8 +37,23 @@
 		);
 		postAModificar = null;
 	}
+	let from = $state(page.url.searchParams.get('from'));
+	$effect(() => {
+		goto('/', { replaceState: true });
+	});
 </script>
 
+{#if from == 'cambio_contraseña'}
+	<Dialog
+		open={true}
+		onOpenChange={() => {
+			from = '';
+		}}
+	>
+		<DialogContent>Se cambio la contraseña del usuario exitosamente</DialogContent>
+	</Dialog>
+{/if}
+
 <svelte:head>
 	<meta property="og:title" content="Mini-x" />
 	<meta property="og:description" content="Pagina Principal" />
diff --git a/src/routes/password-reset/+page.svelte b/src/routes/password-reset/+page.svelte
index e60079b..c56b523 100644
--- a/src/routes/password-reset/+page.svelte
+++ b/src/routes/password-reset/+page.svelte
@@ -14,6 +14,7 @@
 
 	let estado: 'email' | 'otp' | 'nuevapass' = $state('email');
 	let email: string = $state('');
+	let otp: string = $state('');
 </script>
 
 <div class="flex min-h-fit w-full items-center justify-center p-6 md:p-10">
@@ -22,10 +23,12 @@
 		<div class="mt-6">
 			{#if estado === 'email'}
 				<IngresarEmail bind:estado bind:email />
-			{:else if estado === 'otp'}
-				<Otp bind:estado />
-			{:else if estado === 'nuevapass'}
-				<NuevaPass />
+			{/if}
+			{#if estado === 'otp'}
+				<Otp bind:estado {email} bind:otp />
+			{/if}
+			{#if estado === 'nuevapass'}
+				<NuevaPass {otp} {email} />
 			{/if}
 		</div>
 	</div>
diff --git a/src/routes/password-reset/IngresarEmail.svelte b/src/routes/password-reset/IngresarEmail.svelte
index 61d370e..bd10395 100644
--- a/src/routes/password-reset/IngresarEmail.svelte
+++ b/src/routes/password-reset/IngresarEmail.svelte
@@ -1,10 +1,14 @@
 <script lang="ts">
+	import CardError from '@/components/CardError.svelte';
 	import Button from '@/components/ui/button/button.svelte';
 	import CardContent from '@/components/ui/card/card-content.svelte';
 	import Card from '@/components/ui/card/card.svelte';
+	import DialogContent from '@/components/ui/dialog/dialog-content.svelte';
+	import Dialog from '@/components/ui/dialog/dialog.svelte';
 	import Input from '@/components/ui/input/input.svelte';
 	import Spinner from '@/components/ui/spinner/spinner.svelte';
 	import { checkEmail } from '@/hooks/checkEmail';
+	import { apiBase } from '@/stores/url';
 	import Check from '@lucide/svelte/icons/check';
 	import Cross from '@lucide/svelte/icons/x';
 	import { slide } from 'svelte/transition';
@@ -13,24 +17,43 @@
 
 	let checkeado = $state<Boolean | null>(null);
 	let esEmailExistente = $state<boolean>(false);
+	let mensajeError = $state('');
+	let lastemail: string;
 
 	$effect(() => {
-		if (email == '') {
+		if (email == '' || !email.includes('@')) {
 			checkeado = null;
 			return;
 		}
+		let timeoutId: ReturnType<typeof setTimeout> | undefined;
 		(async () => {
-			checkeado = true;
-			await Promise.all([checkEmaill(), new Promise((resolve) => setTimeout(resolve, 100))]);
-			checkeado = false;
+			if (timeoutId) clearTimeout(timeoutId);
+			timeoutId = setTimeout(async () => {
+				checkeado = true;
+				await checkEmaill();
+				checkeado = false;
+			}, 1000);
 		})();
 	});
 
 	async function checkEmaill() {
-		esEmailExistente = !(await checkEmail(email));
+		try {
+			if (lastemail == email) return;
+			lastemail = email;
+			esEmailExistente = !(await checkEmail(email));
+		} catch {
+			esEmailExistente = false;
+		}
 	}
 </script>
 
+{#if mensajeError}
+	<Dialog open={!!mensajeError} onOpenChange={() => (mensajeError = '')}>
+		<DialogContent>
+			<CardError {mensajeError} />
+		</DialogContent>
+	</Dialog>
+{/if}
 <div transition:slide>
 	<Card>
 		<CardContent>
@@ -47,16 +70,31 @@
 						<Cross class="text-red-500" />
 					{/if}
 				</h2>
-				<Input type="email" placeholder="correo@ejemplo.com" bind:value={email} />
-				<Button
-					disabled={!esEmailExistente}
-					onclick={async () => {
-						///WIP
-						estado = 'otp';
+				<form
+					onsubmit={async (e) => {
+						e.preventDefault();
+						try {
+							const formData = new FormData();
+							formData.append('email', email);
+							const req = await fetch(`${$apiBase}/api/password-reset/otp`, {
+								method: 'POST',
+								body: formData
+							});
+							if (req.ok) {
+								estado = 'otp';
+								return;
+							}
+							mensajeError = await req.text();
+						} catch {
+							mensajeError = 'No se pudo alcanzar el servidor';
+						}
 					}}
 				>
-					Enviar código
-				</Button>
+					<div class="flex flex-col gap-2">
+						<Input type="email" placeholder="correo@ejemplo.com" bind:value={email} />
+						<Button type="submit" disabled={!esEmailExistente}>Enviar código</Button>
+					</div>
+				</form>
 			</div>
 		</CardContent>
 	</Card>
diff --git a/src/routes/password-reset/NuevaPass.svelte b/src/routes/password-reset/NuevaPass.svelte
index 7cf9f6b..54cabf8 100644
--- a/src/routes/password-reset/NuevaPass.svelte
+++ b/src/routes/password-reset/NuevaPass.svelte
@@ -1,17 +1,66 @@
 <script>
+	import { goto } from '$app/navigation';
+	import CardError from '@/components/CardError.svelte';
 	import Button from '@/components/ui/button/button.svelte';
 	import CardContent from '@/components/ui/card/card-content.svelte';
 	import Card from '@/components/ui/card/card.svelte';
+	import DialogContent from '@/components/ui/dialog/dialog-content.svelte';
+	import Dialog from '@/components/ui/dialog/dialog.svelte';
 	import Input from '@/components/ui/input/input.svelte';
 	import Label from '@/components/ui/label/label.svelte';
+	import { apiBase } from '@/stores/url';
+	import { sesionStore } from '@/stores/usuario';
 	import { slide } from 'svelte/transition';
+
+	let { otp, email } = $props();
+
+	let pass = $state('');
+	let pass2 = $state('');
+	let coinsiden = $derived(
+		pass === pass2 &&
+			/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9])[A-Za-z\d\W_]*$/.test(pass) &&
+			pass.length > 8
+	);
+	let mensajeError = $state('');
 </script>
 
+{#if mensajeError}
+	<Dialog open={!!mensajeError} onOpenChange={() => (mensajeError = '')}>
+		<DialogContent>
+			<CardError {mensajeError} />
+		</DialogContent>
+	</Dialog>
+{/if}
+
 <div transition:slide>
 	<Card>
 		<CardContent>
 			<h2 class="mb-4 text-2xl font-bold">Crear una Nueva Contraseña</h2>
-			<form onsubmit={() => {}}>
+			<form
+				onsubmit={async (e) => {
+					e.preventDefault();
+					const formData = new FormData();
+					formData.append('otp', otp);
+					formData.append('email', email);
+					formData.append('newpass', pass);
+					try {
+						const req = await fetch(`${$apiBase}/api/password-reset/change`, {
+							method: 'PATCH',
+							body: formData
+						});
+						if (req.ok) {
+							const token = await req.json();
+							sesionStore.set(token);
+							goto('/?from=cambio_contraseña');
+							return;
+						}
+						const data = await req.text();
+						mensajeError = data;
+					} catch {
+						mensajeError = 'No se pudo alcanzar el servidor';
+					}
+				}}
+			>
 				<div class="space-y-4">
 					<div>
 						<Label for="password" class="mb-1 block text-sm font-medium">Contraseña</Label>
@@ -20,7 +69,12 @@
 							id="password"
 							class="w-full px-3 py-2"
 							placeholder="Ingresa tu nueva contraseña"
+							bind:value={pass}
 						/>
+						<p class="mt-2 text-sm text-gray-500">
+							La contraseña debe contener al menos una mayúscula, una minúscula, un número y un
+							carácter especial. Además de 8 chars de longitud.
+						</p>
 					</div>
 					<div>
 						<Label for="confirmPassword" class="mb-1 block text-sm font-medium"
@@ -31,9 +85,10 @@
 							id="confirmPassword"
 							class="w-full px-3 py-2"
 							placeholder="Repite tu nueva contraseña"
+							bind:value={pass2}
 						/>
 					</div>
-					<Button type="submit">Establecer Contraseña</Button>
+					<Button disabled={!coinsiden} type="submit">Establecer Contraseña</Button>
 				</div>
 			</form>
 		</CardContent>
diff --git a/src/routes/password-reset/Otp.svelte b/src/routes/password-reset/Otp.svelte
index ab14abc..39c9cec 100644
--- a/src/routes/password-reset/Otp.svelte
+++ b/src/routes/password-reset/Otp.svelte
@@ -1,15 +1,38 @@
 <script>
+	import CardError from '@/components/CardError.svelte';
 	import Button from '@/components/ui/button/button.svelte';
 	import CardContent from '@/components/ui/card/card-content.svelte';
 	import Card from '@/components/ui/card/card.svelte';
+	import DialogContent from '@/components/ui/dialog/dialog-content.svelte';
+	import Dialog from '@/components/ui/dialog/dialog.svelte';
 	import InputOtpGroup from '@/components/ui/input-otp/input-otp-group.svelte';
 	import InputOtpSlot from '@/components/ui/input-otp/input-otp-slot.svelte';
 	import InputOtp from '@/components/ui/input-otp/input-otp.svelte';
+	import { apiBase } from '@/stores/url';
 	import { slide } from 'svelte/transition';
 
-	let { estado = $bindable() } = $props();
+	let { estado = $bindable(), email, otp = $bindable() } = $props();
+
+	let checkeado = $state(false);
+	let mensajeError = $state('');
+
+	$effect(() => {
+		if (otp && otp.length === 6) {
+			checkeado = true;
+		} else {
+			checkeado = false;
+		}
+	});
 </script>
 
+{#if mensajeError}
+	<Dialog open={!!mensajeError} onOpenChange={() => (mensajeError = '')}>
+		<DialogContent>
+			<CardError {mensajeError} />
+		</DialogContent>
+	</Dialog>
+{/if}
+
 <div transition:slide>
 	<Card>
 		<CardContent>
@@ -21,10 +44,10 @@
 
 				<div class="space-y-4">
 					<div class="flex justify-center">
-						<InputOtp maxlength={6}>
+						<InputOtp maxlength={6} bind:value={otp}>
 							{#snippet children({ cells })}
 								<InputOtpGroup>
-									{#each cells as cell, i}
+									{#each cells as cell}
 										<InputOtpSlot class="p-3!" {cell}></InputOtpSlot>
 									{/each}
 								</InputOtpGroup>
@@ -33,7 +56,30 @@
 					</div>
 
 					<div class="flex justify-between">
-						<Button onclick={() => (estado = 'nuevapass')}>Verificar</Button>
+						<Button
+							disabled={!checkeado}
+							onclick={async () => {
+								try {
+									const formData = new FormData();
+									formData.append('otp', otp);
+									formData.append('email', email);
+									let req = await fetch(`${$apiBase}/api/password-reset/otp/check`, {
+										method: 'POST',
+										body: formData
+									});
+									if (req.ok) {
+										estado = 'nuevapass';
+										return;
+									} else {
+										mensajeError = await req.text();
+									}
+								} catch {
+									mensajeError = 'No se pudo alcanzar el servidor';
+								}
+							}}
+						>
+							Verificar
+						</Button>
 
 						<Button variant="link" onclick={() => console.log('Reenviar código')}>
 							Reenviar código de verificación