diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 0b4cb3611..12714268e 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -74,15 +74,11 @@
         </b-col>
         <b-col class="text-right">
           <b-button class="test-submit" type="submit" variant="primary" :disabled="disabled">
-            {{ id === null ? $t('contribution.submit') : $t('form.edit') }}
+            {{ value.id ? $t('form.edit') : $t('contribution.submit') }}
           </b-button>
         </b-col>
       </b-row>
     </b-form>
-    {{ typeof this.$store.state.creation[2] }}, {{ typeof this.form.amount }},
-    {{ typeof maxGddThisMonth }}({{ maxGddThisMonth }})
-    <br />
-    {{ isThisMonth }}
   </div>
 </template>
 <script>
@@ -102,10 +98,10 @@ export default {
   },
   methods: {
     submit() {
-      if (this.id === null) {
-        this.$emit('set-contribution', this.form)
+      if (this.value.id) {
+        this.$emit('update-contribution', this.form)
       } else {
-        this.$emit('edit-contribution', this.value)
+        this.$emit('set-contribution', this.form)
       }
       this.reset()
     },
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 8675c0440..081d307af 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -18,7 +18,7 @@
           @click="
             $emit('update-contribution-form', {
               id: id,
-              createdAt: createdAt,
+              contributionDate: contributionDate,
               memo: memo,
               amount: amount,
             })
@@ -54,6 +54,9 @@ export default {
     createdAt: {
       type: String,
     },
+    contributionDate: {
+      type: String,
+    },
     deletedAt: {
       type: String,
     },
@@ -83,7 +86,7 @@ export default {
     date() {
       if (this.deletedAt) return this.deletedAt
       if (this.confirmedAt) return this.confirmedAt
-      return this.createdAt
+      return this.contributionDate
     },
   },
   methods: {
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index c2ecfb00e..b74770227 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -182,8 +182,10 @@ export const listContributions = gql`
         amount
         memo
         createdAt
+        contributionDate
         confirmedAt
         confirmedBy
+        deletedAt
       }
     }
   }
@@ -200,6 +202,7 @@ export const listAllContributions = gql`
         amount
         memo
         createdAt
+        contributionDate
         confirmedAt
         confirmedBy
       }
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index f1218a2fd..f1bf3dbd8 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -179,7 +179,7 @@ export default {
     },
     updateContributionForm(item) {
       this.form.id = item.id
-      this.form.date = item.createdAt
+      this.form.date = item.contributionDate
       this.form.memo = item.memo
       this.form.amount = item.amount
       this.tabIndex = 0