diff --git a/Backend/src/controllers/AuthController.ts b/Backend/src/controllers/AuthController.ts
index 163ab568..47f61722 100644
--- a/Backend/src/controllers/AuthController.ts
+++ b/Backend/src/controllers/AuthController.ts
@@ -28,31 +28,35 @@ export class AuthController {
     @SuccessResponse('200', 'Login successful')
     @Response('401', 'Invalid credentials')
     @Example<LoginResponse>({
-        token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...',
-        refreshToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...',
-        user: {
-            id: 1,
-            username: 'admin',
-            email: 'admin@elearning.local',
-            updated_at: new Date('2024-01-01T00:00:00Z'),
-            created_at: new Date('2024-01-01T00:00:00Z'),
-            role: {
-                code: 'ADMIN',
-                name: {
-                    th: 'ผู้ดูแลระบบ',
-                    en: 'Administrator'
-                }
-            },
-            profile: {
-                prefix: {
-                    th: 'นาย',
-                    en: 'Mr.'
+        code: 200,
+        message: 'Login successful',
+        data: {
+            token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...',
+            refreshToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...',
+            user: {
+                id: 1,
+                username: 'admin',
+                email: 'admin@elearning.local',
+                updated_at: new Date('2024-01-01T00:00:00Z'),
+                created_at: new Date('2024-01-01T00:00:00Z'),
+                role: {
+                    code: 'ADMIN',
+                    name: {
+                        th: 'ผู้ดูแลระบบ',
+                        en: 'Administrator'
+                    }
                 },
-                first_name: 'Admin',
-                last_name: 'User',
-                phone: null,
-                avatar_url: null,
-                birth_date: null
+                profile: {
+                    prefix: {
+                        th: 'นาย',
+                        en: 'Mr.'
+                    },
+                    first_name: 'Admin',
+                    last_name: 'User',
+                    phone: null,
+                    avatar_url: null,
+                    birth_date: null
+                }
             }
         }
     })
diff --git a/Backend/src/services/auth.service.ts b/Backend/src/services/auth.service.ts
index ad565c93..1860b601 100644
--- a/Backend/src/services/auth.service.ts
+++ b/Backend/src/services/auth.service.ts
@@ -58,9 +58,13 @@ export class AuthService {
         logger.info('User logged in successfully', { userId: user.id, email: user.email });
 
         return {
-            token,
-            refreshToken,
-            user: await this.formatUserResponse(user)
+            code: 200,
+            message: 'Login successful',
+            data: {
+                token,
+                refreshToken,
+                user: await this.formatUserResponse(user)
+            }
         };
     }
 
diff --git a/Backend/src/types/auth.types.ts b/Backend/src/types/auth.types.ts
index d7d016e5..be1fe625 100644
--- a/Backend/src/types/auth.types.ts
+++ b/Backend/src/types/auth.types.ts
@@ -23,9 +23,13 @@ export interface RegisterRequest {
 }
 
 export interface LoginResponse {
-    token: string;
-    refreshToken: string;
-    user: UserResponse;
+    code: number;
+    message: string;
+    data: {
+        token: string;
+        refreshToken: string;
+        user: UserResponse;
+    };
 }
 
 export interface RegisterResponse {