diff --git a/src/components/02_personnel-management/FormPerson.vue b/src/components/02_personnel-management/FormPerson.vue
index 5bcfeb01..e43b12d1 100644
--- a/src/components/02_personnel-management/FormPerson.vue
+++ b/src/components/02_personnel-management/FormPerson.vue
@@ -424,7 +424,6 @@ watch(
         :id="`${prefixId}-input-citizen-issue`"
         :readonly="readonly"
         :label="$t('personnel.form.citizenIssue')"
-        :disabled-dates="disabledAfterToday"
         :rules="[
           (val: string) =>
             !!val ||
@@ -432,6 +431,17 @@ watch(
               field: $t('personnel.form.citizenIssue'),
             }),
         ]"
+        @update:model-value="
+          (v) => {
+            if (!v) return;
+            if (!citizenExpire) return;
+            if (new Date(v).getTime() >= new Date(citizenExpire).getTime()) {
+              const newValue = new Date(v);
+              newValue.setDate(newValue.getDate() + 1);
+              citizenExpire = newValue;
+            }
+          }
+        "
       />
 
       <DatePicker
@@ -441,6 +451,11 @@ watch(
         :id="`${prefixId}-input-citizen-expire`"
         :readonly="readonly"
         :label="$t('personnel.form.citizenExpire')"
+        :disabled-dates="
+          (date: Date) =>
+            date.getTime() <
+            ((citizenIssue && new Date(citizenIssue).getTime()) || Date.now())
+        "
       />
 
       <q-select