diff --git a/src/components/03_customer-management/FormEmployeePassport.vue b/src/components/03_customer-management/FormEmployeePassport.vue
index b7a3e6e5..80ea8775 100644
--- a/src/components/03_customer-management/FormEmployeePassport.vue
+++ b/src/components/03_customer-management/FormEmployeePassport.vue
@@ -32,6 +32,8 @@ const firstName = defineModel<string>('firstName');
 const namePrefix = defineModel<string>('namePrefix');
 const passportNumber = defineModel<string>('passportNumber');
 
+const passportValidator = /[a-zA-Z]{1}[a-zA-Z0-9]{1}[0-9]{5,7}$/;
+
 const genderOptions = ref<Record<string, unknown>[]>([]);
 let genderFilter: (
   value: string,
@@ -275,7 +277,6 @@ watch(
             </q-item>
           </template>
         </q-select>
-
         <q-input
           :for="`${prefixId}-input-previous-passport-Number`"
           :dense="dense"
@@ -287,8 +288,9 @@ watch(
           v-model="previousPassportRef"
           :rules="[
             (v) =>
-              (!!v && v.length === 6) ||
-              $t('form.error.requireLength', { msg: 6 }),
+              !v ||
+              passportValidator.test(v) ||
+              $t('form.error.passportFormat'),
           ]"
         />
 
@@ -484,7 +486,9 @@ watch(
           :label="$t('customerEmployee.form.passportNo')"
           v-model="passportNumber"
           :rules="[
-            (val) => (val && val.length > 0) || $t('form.error.required'),
+            (val) => !!val || $t('form.error.required'),
+            (val) =>
+              passportValidator.test(val) || $t('form.error.passportFormat'),
           ]"
         />