diff --git a/src/views/base/accounts/AccountEditPageBase.ts b/src/views/base/accounts/AccountEditPageBase.ts
index 8ce60cf6..23f44cf2 100644
--- a/src/views/base/accounts/AccountEditPageBase.ts
+++ b/src/views/base/accounts/AccountEditPageBase.ts
@@ -18,13 +18,13 @@ import {
     getCurrentUnixTime
 } from '@/lib/datetime.ts';
 
-export interface DayAndDisplayName {
-    readonly day: number;
-    readonly displayName: string;
-}
-
 export function useAccountEditPageBase() {
-    const { tt, getAllAccountCategories, getAllAccountTypes, getMonthdayShortName } = useI18n();
+    const {
+        tt,
+        getAvailableMonthDays,
+        getAllAccountCategories,
+        getAllAccountTypes
+    } = useI18n();
 
     const settingsStore = useSettingsStore();
     const userStore = useUserStore();
@@ -80,21 +80,14 @@ export function useAccountEditPageBase() {
     const allAccountCategories = computed<LocalizedAccountCategory[]>(() => getAllAccountCategories(customAccountCategoryOrder.value));
     const allAccountTypes = computed<TypeAndDisplayName[]>(() => getAllAccountTypes());
 
-    const allAvailableMonthDays = computed<DayAndDisplayName[]>(() => {
-        const allAvailableDays: DayAndDisplayName[] = [];
+    const allAvailableMonthDays = computed<TypeAndDisplayName[]>(() => {
+        const allAvailableDays: TypeAndDisplayName[] = getAvailableMonthDays(28);
 
-        allAvailableDays.push({
-            day: 0,
+        allAvailableDays.splice(0, 0, {
+            type: 0,
             displayName: tt('Not set'),
         });
 
-        for (let i = 1; i <= 28; i++) {
-            allAvailableDays.push({
-                day: i,
-                displayName: getMonthdayShortName(i),
-            });
-        }
-
         return allAvailableDays;
     });
 
@@ -114,7 +107,7 @@ export function useAccountEditPageBase() {
 
     function getAccountCreditCardStatementDate(statementDate?: number): string | null {
         for (const item of allAvailableMonthDays.value) {
-            if (item.day === statementDate) {
+            if (item.type === statementDate) {
                 return item.displayName;
             }
         }
diff --git a/src/views/desktop/accounts/list/dialogs/EditDialog.vue b/src/views/desktop/accounts/list/dialogs/EditDialog.vue
index 0124d73b..766ee0d1 100644
--- a/src/views/desktop/accounts/list/dialogs/EditDialog.vue
+++ b/src/views/desktop/accounts/list/dialogs/EditDialog.vue
@@ -118,7 +118,7 @@
                                 <v-col cols="12" :md="account.type === AccountType.SingleAccount.type || currentAccountIndex >= 0 ? 6 : 12" v-if="currentAccountIndex < 0 && isAccountSupportCreditCardStatementDate">
                                     <v-autocomplete
                                         item-title="displayName"
-                                        item-value="day"
+                                        item-value="type"
                                         auto-select-first
                                         persistent-placeholder
                                         :disabled="loading || submitting"
diff --git a/src/views/mobile/accounts/EditPage.vue b/src/views/mobile/accounts/EditPage.vue
index e2823c09..4c09a0cf 100644
--- a/src/views/mobile/accounts/EditPage.vue
+++ b/src/views/mobile/accounts/EditPage.vue
@@ -189,7 +189,7 @@
                 @click="accountContext.showCreditCardStatementDatePopup = true"
             >
                 <list-item-selection-popup value-type="item"
-                                           key-field="day" value-field="day"
+                                           key-field="type" value-field="type"
                                            title-field="displayName"
                                            :title="tt('Statement Date')"
                                            :enable-filter="true"
@@ -322,7 +322,7 @@
                 @click="accountContext.showCreditCardStatementDatePopup = true"
             >
                 <list-item-selection-popup value-type="item"
-                                           key-field="day" value-field="day"
+                                           key-field="type" value-field="type"
                                            title-field="displayName"
                                            :title="tt('Statement Date')"
                                            :enable-filter="true"