diff --git a/internal/webserver/embedded/js/xh-error-check.js b/internal/webserver/embedded/js/xh-error-check.js
index 2ac93c9..391e1e9 100644
--- a/internal/webserver/embedded/js/xh-error-check.js
+++ b/internal/webserver/embedded/js/xh-error-check.js
@@ -1,5 +1,7 @@
 document.body.addEventListener('htmx:afterRequest', function (evt) {
     const errorTarget = document.getElementById("box-error")
+    const unexpectedServerError = errorTarget.getAttribute("data-unexpected-server-error")
+    const unexpectedError = errorTarget.getAttribute("data-unexpected-error")
     if (evt.detail.successful) {
         // Successful request, clear out alert
         errorTarget.setAttribute("hidden", "true")
@@ -12,12 +14,12 @@ document.body.addEventListener('htmx:afterRequest', function (evt) {
         }
 
         console.warn("Server error", evt.detail)
-        errorTarget.innerText = `Unexpected server error: ${xhr.status} - ${xhr.statusText}`;
-        errorTarget.removeAttribute("hidden");
+        errorTarget.innerText = unexpectedServerError + `${xhr.status} - ${xhr.statusText}`
+        errorTarget.removeAttribute("hidden")
     } else {
         // Unspecified failure, usually caused by network error
         console.error("Unexpected htmx error", evt.detail)
-        errorTarget.innerText = "Unexpected error, check your connection and try to refresh the page.";
-        errorTarget.removeAttribute("hidden");
+        errorTarget.innerText = unexpectedError
+        errorTarget.removeAttribute("hidden")
     }
-});
\ No newline at end of file
+});
diff --git a/internal/webserver/embedded/translations/es.yml b/internal/webserver/embedded/translations/es.yml
index 3c355f1..5a31073 100644
--- a/internal/webserver/embedded/translations/es.yml
+++ b/internal/webserver/embedded/translations/es.yml
@@ -133,3 +133,6 @@
 "Go left": "Ir a la izquierda"
 "Go right": "Ir a la derecha"
 "Session expired, please log in again.": "Sesión expirada, por favor identifícate de nuevo."
+"Unexpected error, check your connection and try to refresh the page.": "Error inesperado, comprueba tu conexión y recarga la página."
+"Unexpected server error": "Error inesperado en el servidor"
+
diff --git a/internal/webserver/embedded/translations/fr.yml b/internal/webserver/embedded/translations/fr.yml
index 7a71638..da1d205 100644
--- a/internal/webserver/embedded/translations/fr.yml
+++ b/internal/webserver/embedded/translations/fr.yml
@@ -133,3 +133,5 @@
 "Go left": "Aller à gauche"
 "Go right": "Aller à droite"
 "Session expired, please log in again.": "Session expirée, veuillez vous reconnecter."
+"Unexpected error, check your connection and try to refresh the page.": "Erreur inattendue, vérifiez votre connexion et essayez d'actualiser la page."
+"Unexpected server error": "Erreur de serveur inattendue"
diff --git a/internal/webserver/embedded/views/partials/main.html b/internal/webserver/embedded/views/partials/main.html
index 30d7b49..32dcb17 100644
--- a/internal/webserver/embedded/views/partials/main.html
+++ b/internal/webserver/embedded/views/partials/main.html
@@ -12,7 +12,7 @@
     {{end}}
 
     <div class="row text-start">
-        <div class="alert alert-danger" role="alert" hidden id="box-error">
+        <div class="alert alert-danger" role="alert" hidden id="box-error" data-unexpected-error='{{t .Lang "Unexpected error, check your connection and try to refresh the page."}}' data-unexpected-server-error='{{t .Lang "Unexpected server error"}}'>
         </div>
     </div>
 
diff --git a/internal/webserver/embedded/views/users/edit.html b/internal/webserver/embedded/views/users/edit.html
index 0fdaa79..d28d79a 100644
--- a/internal/webserver/embedded/views/users/edit.html
+++ b/internal/webserver/embedded/views/users/edit.html
@@ -63,7 +63,7 @@
     </div>
     <div class='tab-pane fade p-3 {{if eq .ActiveTab "password"}}show active{{end}}' id="password-tab-pane" role="tabpanel" aria-labelledby="password-tab"
         tabindex="0">
-        <form hx-put="/{{.Lang}}/users/{{.User.Username}}" hx-target="body">
+        <form hx-put="/{{.Lang}}/users/{{.User.Username}}" hx-target="main" hx-target-400="main">
             {{if eq .Session.Uuid .User.Uuid}}
             <div class="mb-3">
                 <label for="old-password" class="form-label">{{t .Lang "Current password"}}</label>
@@ -103,4 +103,4 @@
     </div>
 </div>
 
-<script type="text/javascript" src="/js/xh-error-check.js"></script>
\ No newline at end of file
+<script type="text/javascript" src="/js/xh-error-check.js"></script>