diff --git a/clients/web/README.md b/clients/web/README.md
index 422de9e38..1fc826513 100644
--- a/clients/web/README.md
+++ b/clients/web/README.md
@@ -36,7 +36,7 @@ clients/web/
 
 ## 🛠️ Comandos
 
-Requisitos minimos:
+Requisitos mínimos:
 
 - Node.js 20.19+ (recomendado 22+)
 - pnpm 10.30+
@@ -67,6 +67,8 @@ pnpm dev:landing
 # Quality
 pnpm format
 pnpm check
+pnpm test
+pnpm test:dashboard
 ```
 
 ## 📦 Añadir más proyectos web
diff --git a/clients/web/apps/dashboard/src/App.vue b/clients/web/apps/dashboard/src/App.vue
index 6c1ae9c56..11f133062 100644
--- a/clients/web/apps/dashboard/src/App.vue
+++ b/clients/web/apps/dashboard/src/App.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, nextTick, ref } from "vue";
+import { computed, nextTick, onUnmounted, ref } from "vue";
 import { useI18n } from "vue-i18n";
 
 // biome-ignore lint/correctness/noUnusedImports: Used in Vue template.
@@ -32,6 +32,9 @@ const secretInputNonce = ref(0);
 const saveStatus = ref<"idle" | "saving" | "success" | "error">("idle");
 const saveErrorMessage = ref("");
 
+let saveStatusTimeoutId: ReturnType<typeof setTimeout> | null = null;
+let requestTimeoutId: ReturnType<typeof setTimeout> | null = null;
+
 let messageIdCounter = 1;
 let pairingCodeInput = "";
 let bearerTokenInput = "";
@@ -54,8 +57,21 @@ function nextMessageId(): number {
   return currentId;
 }
 
+function resetSaveStatus(): void {
+  if (saveStatus.value === "saving") {
+    return;
+  }
+
+  if (saveStatusTimeoutId) {
+    clearTimeout(saveStatusTimeoutId);
+    saveStatusTimeoutId = null;
+  }
+  saveStatus.value = "idle";
+}
+
 // biome-ignore lint/correctness/noUnusedVariables: Used in Vue template.
 function captureSecretInput(field: SecretField, value: string): void {
+  resetSaveStatus();
   if (field === "pairingCode") {
     pairingCodeInput = value;
     return;
@@ -69,24 +85,31 @@ function captureSecretInput(field: SecretField, value: string): void {
 
 // biome-ignore lint/correctness/noUnusedVariables: Used in Vue template.
 async function saveGatewayConfig(): Promise<void> {
+  resetSaveStatus();
   saveStatus.value = "saving";
   saveErrorMessage.value = "";
 
   const gatewayBaseUrl = baseUrl.value.replace(/\/$/, "");
+  const controller = new AbortController();
+  requestTimeoutId = setTimeout(() => controller.abort(), 10000);
 
   try {
+    const payload: Record<string, string> = {
+      gatewayId: "default",
+      baseUrl: gatewayBaseUrl,
+    };
+
+    if (pairingCodeInput) payload.pairingCode = pairingCodeInput;
+    if (bearerTokenInput) payload.bearerToken = bearerTokenInput;
+    if (webhookSecretInput) payload.webhookSecret = webhookSecretInput;
+
     const response = await fetch(`${gatewayBaseUrl}/web/dashboard/config`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
       },
-      body: JSON.stringify({
-        gatewayId: "default",
-        baseUrl: baseUrl.value,
-        pairingCode: pairingCodeInput,
-        bearerToken: bearerTokenInput,
-        webhookSecret: webhookSecretInput,
-      }),
+      body: JSON.stringify(payload),
+      signal: controller.signal,
     });
 
     if (!response.ok) {
@@ -98,10 +121,23 @@ async function saveGatewayConfig(): Promise<void> {
     webhookSecretInput = "";
     secretInputNonce.value += 1;
     saveStatus.value = "success";
+
+    saveStatusTimeoutId = setTimeout(() => {
+      saveStatus.value = "idle";
+    }, 3000);
   } catch (error) {
     saveStatus.value = "error";
-    saveErrorMessage.value = t("form.saveError");
+    if (error instanceof Error && error.name === "AbortError") {
+      saveErrorMessage.value = t("form.timeoutError") || "Request timeout";
+    } else {
+      saveErrorMessage.value = t("form.saveError");
+    }
     console.error("Error saving gateway config", error);
+  } finally {
+    if (requestTimeoutId) {
+      clearTimeout(requestTimeoutId);
+      requestTimeoutId = null;
+    }
   }
 }
 
@@ -136,6 +172,11 @@ async function sendMessage(): Promise<void> {
   await nextTick();
   scrollChatToBottom();
 }
+
+onUnmounted(() => {
+  if (saveStatusTimeoutId) clearTimeout(saveStatusTimeoutId);
+  if (requestTimeoutId) clearTimeout(requestTimeoutId);
+});
 </script>
 
 <template>
@@ -160,13 +201,14 @@ async function sendMessage(): Promise<void> {
       >
         <label class="space-y-1 text-sm">
           <span class="font-medium">{{ t("form.baseUrl") }}</span>
-          <Input v-model="baseUrl" :placeholder="t('form.baseUrlPlaceholder')" />
+          <Input v-model="baseUrl" :placeholder="t('form.baseUrlPlaceholder')" @update:model-value="resetSaveStatus" />
         </label>
         <label class="space-y-1 text-sm">
           <span class="font-medium">{{ t("form.pairingCode") }}</span>
           <Input
             :key="`pairing-${secretInputNonce}`"
             :placeholder="t('form.pairingCodePlaceholder')"
+            type="password"
             @update:model-value="(value: string) => captureSecretInput('pairingCode', value)"
           />
         </label>
diff --git a/clients/web/apps/dashboard/src/locales/es.json b/clients/web/apps/dashboard/src/locales/es.json
index 4c5e214b0..620770ed7 100644
--- a/clients/web/apps/dashboard/src/locales/es.json
+++ b/clients/web/apps/dashboard/src/locales/es.json
@@ -16,7 +16,8 @@
     "webhookSecretPlaceholder": "Secreto del webhook",
     "save": "Guardar configuración",
     "saveSuccess": "Configuración guardada correctamente",
-    "saveError": "No se pudo guardar la configuración"
+    "saveError": "No se pudo guardar la configuración",
+    "timeoutError": "Tiempo de espera agotado"
   },
   "chat": {
     "welcome": "Hola, soy {modelName}. ¿En qué puedo ayudarte?",
diff --git a/clients/web/package.json b/clients/web/package.json
index 1d126380e..de7175bdd 100644
--- a/clients/web/package.json
+++ b/clients/web/package.json
@@ -16,7 +16,9 @@
     "dev:dashboard": "pnpm --filter @corvus/dashboard run dev",
     "format": "pnpm -r run format",
     "check": "pnpm -r run check",
-    "clean": "pnpm -r run clean"
+    "clean": "pnpm -r run clean",
+    "test": "pnpm -r run test",
+    "test:dashboard": "pnpm --filter @corvus/dashboard run test"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.2",