diff --git a/handler/web/user.go b/handler/web/user.go
index faf7845..086566f 100644
--- a/handler/web/user.go
+++ b/handler/web/user.go
@@ -1,7 +1,6 @@
 package web
 
 import (
-	"encoding/json"
 	"net/http"
 	"strconv"
 	"time"
@@ -24,6 +23,7 @@ func (h *UserHandler) LoginHandler(w http.ResponseWriter, r *http.Request) error
 		if response.Status && code == http.StatusOK {
 			user, ok := response.Data["user"].(*models.User)
 			if ok && user.ID > 0 {
+				w.Header().Set("HX-Redirect", "/")
 				http.SetCookie(w, &http.Cookie{
 					Name:    "auth",
 					Value:   strconv.Itoa(user.ID),
@@ -31,12 +31,9 @@ func (h *UserHandler) LoginHandler(w http.ResponseWriter, r *http.Request) error
 				})
 			}
 		}
-		json.NewEncoder(w).Encode(response)
-		return nil
-	default:
-		json.NewEncoder(w).Encode(map[string]any{"status": false, "message": "not supported request", "data": nil})
-		return nil
+		w.Write([]byte(response.Message))
 	}
+	return nil
 }
 
 func (h *UserHandler) RegisterHandler(w http.ResponseWriter, r *http.Request) error {
@@ -48,6 +45,7 @@ func (h *UserHandler) RegisterHandler(w http.ResponseWriter, r *http.Request) er
 		if response.Status && code == http.StatusCreated {
 			user, ok := response.Data["user"].(*models.User)
 			if ok && user.ID > 0 {
+				w.Header().Set("HX-Redirect", "/")
 				http.SetCookie(w, &http.Cookie{
 					Name:    "auth",
 					Value:   strconv.Itoa(user.ID),
@@ -55,12 +53,9 @@ func (h *UserHandler) RegisterHandler(w http.ResponseWriter, r *http.Request) er
 				})
 			}
 		}
-		json.NewEncoder(w).Encode(response)
-		return nil
-	default:
-		json.NewEncoder(w).Encode(map[string]any{"status": false, "message": "not supported request", "data": nil})
-		return nil
+		w.Write([]byte(response.Message))
 	}
+	return nil
 }
 
 func (h *UserHandler) HomeHandler(w http.ResponseWriter, _ *http.Request) error {
diff --git a/views/pages/login.gohtml b/views/pages/login.gohtml
index 32e4877..e9f7b85 100644
--- a/views/pages/login.gohtml
+++ b/views/pages/login.gohtml
@@ -3,7 +3,7 @@
 {{define "content"}}
 <div class="bg-white p-8 rounded-lg shadow-md w-96">
     <h2 class="text-xl mb-4">Sign In</h2>
-    <form hx-post="/login" hx-target="#toast" hx-ext="json-enc" hx-on="htmx:afterRequest: handleLoginResponse(event)" novalidate autocomplete="off">
+    <form hx-post="/login" hx-target="#toast" hx-ext="json-enc" novalidate autocomplete="off">
         <div class="mb-4">
             <label class="block text-gray-700 text-sm font-bold mb-2" for="email">
                 Email
@@ -25,13 +25,4 @@
         <span id="toast"></span>
     </form>
 </div>
-<script>
-    function handleLoginResponse(event) {
-        const response = JSON.parse(event.detail.xhr.response);
-        document.querySelector('#toast').innerHTML = response.message;
-        if (response.status) {
-            window.location.href = "/";
-        }
-    }
-</script>
 {{end}}
\ No newline at end of file
diff --git a/views/pages/register.gohtml b/views/pages/register.gohtml
index 6c621ef..aa0ec05 100644
--- a/views/pages/register.gohtml
+++ b/views/pages/register.gohtml
@@ -37,16 +37,4 @@
         <span id="toast"></span>
     </form>
 </div>
-{{end}}
-
-{{define "js"}}
-<script>
-    document.body.addEventListener('htmx:afterRequest', function(evt) {
-        const response = JSON.parse(evt.detail.xhr.response)
-        document.querySelector('#toast').innerHTML = response.message;
-        if (response.status) {
-            window.location.href = "/";
-        }
-    });
-</script>
 {{end}}
\ No newline at end of file