diff --git a/src/components/form/AddressForm.vue b/src/components/form/AddressForm.vue
index 42e8b723..1279264d 100644
--- a/src/components/form/AddressForm.vue
+++ b/src/components/form/AddressForm.vue
@@ -24,6 +24,8 @@ defineProps<{
 }>();
 
 const adrressStore = useAddressStore();
+const workplace = defineModel<string>('workplace', { default: '' });
+const workplaceEN = defineModel<string>('workplaceEN', { default: '' });
 const address = defineModel('address', { default: '' });
 const addressEN = defineModel('addressEN', { default: '' });
 const provinceId = defineModel<string | null | undefined>('provinceId');
@@ -200,6 +202,29 @@ watch(districtId, fetchSubDistrict);
         {{ addressTitle || $t('formDialogTitleAddressPure') }}
       </div>
       <div class="col-12 row q-col-gutter-sm">
+        <div class="row col-12">
+          <q-input
+            outlined
+            hide-bottom-space
+            class="col-6"
+            v-model="workplace"
+            lazy-rules="ondemand"
+            :dense="dense"
+            :label="$t('customer.form.workplace')"
+            :readonly="readonly || sameWithEmployer"
+            :for="`${prefixId}-${indexId !== undefined ? `input-address-${indexId}` : 'input-address'}`"
+            :rules="
+              disabledRule
+                ? []
+                : [
+                    (val) =>
+                      (val && val.length > 0) ||
+                      $t('formDialogInputAddressValidate'),
+                  ]
+            "
+          />
+        </div>
+
         <q-input
           outlined
           hide-bottom-space
@@ -365,6 +390,29 @@ watch(districtId, fetchSubDistrict);
         {{ addressTitleEN || $t('formDialogTitleAddressPureEN') }}
       </div>
       <div class="col-12 row q-col-gutter-sm">
+        <div class="row col-12">
+          <q-input
+            outlined
+            hide-bottom-space
+            class="col-6"
+            v-model="workplaceEN"
+            lazy-rules="ondemand"
+            :dense="dense"
+            :label="$t('customer.form.workplaceEN')"
+            :readonly="readonly || sameWithEmployer"
+            :for="`${prefixId}-${indexId !== undefined ? `input-address-${indexId}` : 'input-address'}`"
+            :rules="
+              disabledRule
+                ? []
+                : [
+                    (val) =>
+                      (val && val.length > 0) ||
+                      $t('formDialogInputAddressValidate'),
+                  ]
+            "
+          />
+        </div>
+
         <q-input
           lazy-rules="ondemand"
           :for="`${prefixId}-${indexId !== undefined ? `input-address-en-${indexId}` : 'input-address-en'}`"