diff --git a/src/stores/branch/types.ts b/src/stores/branch/types.ts
index 93359487..7307ccf8 100644
--- a/src/stores/branch/types.ts
+++ b/src/stores/branch/types.ts
@@ -21,9 +21,9 @@ export type Branch = {
   districtId: string | null;
   provinceId: string | null;
   addressEN: string;
-  addressTH: string;
+  address: string;
   nameEN: string;
-  nameTH: string;
+  name: string;
   taxNo: string;
   code: string;
   id: string;
@@ -33,9 +33,9 @@ export type BranchCreate = {
   code: string;
   taxNo: string;
   nameEN: string;
-  nameTH: string;
+  name: string;
   addressEN: string;
-  addressTH: string;
+  address: string;
   zipCode: string;
   email: string;
   telephoneNo: string;
diff --git a/src/stores/user/types.ts b/src/stores/user/types.ts
index 3b4efcac..58ff7c5b 100644
--- a/src/stores/user/types.ts
+++ b/src/stores/user/types.ts
@@ -10,18 +10,18 @@ export type User = {
   createdAt: string;
   createdBy: string;
   status: Status;
-  trainingPlace: string;
-  importNationality: string;
-  sourceNationality: string;
-  licenseExpireDate: string;
-  licenseIssueDate: string;
-  licenseNo: string;
-  discountCondition: string;
+  trainingPlace: string | null;
+  importNationality: string | null;
+  sourceNationality: string | null;
+  licenseExpireDate: string | null;
+  licenseIssueDate: string | null;
+  licenseNo: string | null;
+  discountCondition: string | null;
   userRole: string;
   userType: string;
-  retireDate: string;
-  startDate: string;
-  registrationNo: string;
+  retireDate: string | null;
+  startDate: string | null;
+  registrationNo: string | null;
   telephoneNo: string;
   email: string;
   zipCode: string;
@@ -29,12 +29,12 @@ export type User = {
   districtId: string | null;
   provinceId: string | null;
   addressEN: string;
-  addressTH: string;
+  address: string;
   lastNameEN: string;
-  lastNameTH: string;
+  lastName: string;
   firstNameEN: string;
-  firstNameTH: string;
-  code: string;
+  firstName: string;
+  code: string | null;
   keycloakId: string;
   id: string;
   profileImageUrl: string;
@@ -48,22 +48,22 @@ export type UserCreate = {
   email: string;
   zipCode: string;
   addressEN: string;
-  addressTH: string;
-  trainingPlace: string;
-  importNationality: string;
-  sourceNationality: string;
-  licenseExpireDate: Date;
-  licenseIssueDate: Date;
-  licenseNo: string;
-  discountCondition: string;
-  retireDate: Date;
-  startDate: Date;
-  registrationNo: string;
-  code: string;
+  address: string;
+  trainingPlace?: string;
+  importNationality?: string;
+  sourceNationality?: string;
+  licenseExpireDate?: Date;
+  licenseIssueDate?: Date;
+  licenseNo?: string;
+  discountCondition?: string;
+  retireDate?: Date;
+  startDate?: Date;
+  registrationNo?: string;
+  code?: string;
   lastNameEN: string;
-  lastNameTH: string;
+  lastName: string;
   firstNameEN: string;
-  firstNameTH: string;
+  firstName: string;
   userRole: string;
   userType: string;
   keycloakId: string;