diff --git a/server/internal/handler/user_handler.go b/server/internal/handler/user_handler.go
index 04ef79f..eb74a15 100644
--- a/server/internal/handler/user_handler.go
+++ b/server/internal/handler/user_handler.go
@@ -2,6 +2,7 @@ package handler
 
 import (
 	"encoding/json"
+	"log"
 	"net/http"
 
 	"github.com/zs/InsightReply/internal/service"
@@ -29,7 +30,8 @@ func (h *UserHandler) Register(w http.ResponseWriter, r *http.Request) {
 
 	user, err := h.svc.Register(body.Email, body.Password, body.Identity)
 	if err != nil {
-		SendError(w, http.StatusInternalServerError, 5001, "Failed to register user")
+		log.Printf("[Register] Failed to register user %s: %v", body.Email, err)
+		SendError(w, http.StatusInternalServerError, 5001, "Failed to register user: "+err.Error())
 		return
 	}
 
diff --git a/web/src/views/Login.vue b/web/src/views/Login.vue
index 14b832f..bb4d956 100644
--- a/web/src/views/Login.vue
+++ b/web/src/views/Login.vue
@@ -25,9 +25,11 @@ const handleLogin = async () => {
     if (!res.ok) throw new Error('Invalid credentials')
     
     const data = await res.json()
-    if (data.token) {
-      localStorage.setItem('jwt_token', data.token)
+    if (data.data && data.data.token) {
+      localStorage.setItem('jwt_token', data.data.token)
       router.push('/dashboard')
+    } else {
+      throw new Error(data.message || 'Login failed')
     }
   } catch (err: any) {
     errorMsg.value = err.message || 'Login failed'