diff --git a/services/auth.service.js b/services/auth.service.js
index fa25709..3e771f8 100644
--- a/services/auth.service.js
+++ b/services/auth.service.js
@@ -2,14 +2,14 @@ const {
   getUserByUserEmailDb, 
   createUserDb 
 } = require('../db/user.db');
-const JWTService = require('../utils/jwt');
 const { hashPassword, comparePassword } = require('../helpers/hashPassword');
 const { ErrorHandler } = require('../helpers/error');
+const JWTService = require('../utils/jwt');
 
 class AuthService {
 
   // Register
-  static async register({ fullname, username, email, phone, password }) {
+  static async register({ fullname, name, email, phone, password }) {
     const existingUser = await getUserByUserEmailDb(email);
     if (existingUser) {
       throw new ErrorHandler(400, 'Email already registered');
@@ -19,7 +19,7 @@ class AuthService {
 
     const userId = await createUserDb({
       user_fullname: fullname,
-      user_name: username,
+      user_name: name,
       user_email: email,
       user_phone: phone,
       user_password: hashedPassword,
@@ -28,11 +28,10 @@ class AuthService {
       is_active: 1
     });
 
-    // ambil user baru
     const newUser = {
       user_id: userId,
       user_fullname: fullname,
-      user_name: username,
+      user_name: name,
       user_email: email,
       user_phone: phone,
       role_id: 3,
@@ -65,7 +64,7 @@ class AuthService {
       user_fullname: user.user_fullname,
       user_name: user.user_name,
       user_email: user.user_email,
-      phone: user.phone,
+      user_phone: user.user_phone,
       role_id: user.role_id,
       role_name: user.role_name,
       is_sa: user.is_sa
@@ -75,7 +74,7 @@ class AuthService {
     return { user: payload, tokens };
   }
 
-  // Refresh token
+  // Refresh Token
   static async refreshToken(refreshToken) {
     if (!refreshToken) {
       throw new ErrorHandler(401, 'Refresh token is required');
@@ -89,13 +88,14 @@ class AuthService {
       user_name: decoded.user_name,
       user_email: decoded.user_email,
       role_id: decoded.role_id,
-      role_name: decoded.role_name
+      role_name: decoded.role_name,
+      is_sa: decoded.is_sa
     };
 
     const accessToken = JWTService.generateAccessToken(payload);
+
     return { accessToken, tokenType: 'Bearer', expiresIn: 900 };
   }
-
 }
 
 module.exports = AuthService;