diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js
index 5d56f4a1b..5340140d0 100644
--- a/frontend/src/apis/communityAPI.js
+++ b/frontend/src/apis/communityAPI.js
@@ -51,14 +51,11 @@ const communityAPI = {
     }
     return apiPost(CONFIG.COMMUNITY_API__URL + 'createCoins/', payload)
   }, */
-  send: async (sessionId, email, amount, memo, targetDate) => {
+  send: async (sessionId, data) => {
     const payload = {
       session_id: sessionId,
-      email,
-      amount,
-      memo,
-      target_date: targetDate,
       auto_sign: true,
+      ...data,
     }
     return apiPost(CONFIG.COMMUNITY_API_URL + 'sendCoins/', payload)
   },
diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index d0257809d..4ad4c27ba 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -4,7 +4,7 @@
     <b-container fluid class="p-2 mt-5">
       <gdd-status v-if="showContext" :balance="balance" :gdt-balance="GdtBalance" />
       <br />
-      <gdd-send :currentTransactionStep="transactionSteps[currentTransactionStep]">
+      <gdd-send :currentTransactionStep="currentTransactionStep">
         <template #transaction-form>
           <transaction-form :balance="balance" @set-transaction="setTransaction"></transaction-form>
         </template>
@@ -58,7 +58,6 @@ export default {
   },
   data() {
     return {
-      showContext: true,
       timestamp: Date.now(),
       transactionData: {
         email: '',
@@ -67,7 +66,6 @@ export default {
         memo: '',
       },
       error: false,
-      transactionSteps: ['transaction-form', 'transaction-confirmation', 'transaction-result'],
       currentTransactionStep: 0,
     }
   },
@@ -79,23 +77,19 @@ export default {
     },
     transactionCount: { type: Number, default: 0 },
   },
+  computed: {
+    showContext() {
+      return this.currentTransactionStep === 0
+    },
+  },
   methods: {
     setTransaction(data) {
-      this.transactionData.email = data.email
-      this.transactionData.amount = data.amount
-      this.transactionData.memo = data.memo
-      this.transactionData.target_date = new Date(Date.now()).toISOString()
-      this.showContext = false
+      data.target_date = new Date(Date.now()).toISOString()
+      this.transactionData = { ...data }
       this.currentTransactionStep = 1
     },
     async sendTransaction() {
-      const result = await communityAPI.send(
-        this.$store.state.sessionId,
-        this.transactionData.email,
-        this.transactionData.amount,
-        this.transactionData.memo,
-        this.transactionData.target_date,
-      )
+      const result = await communityAPI.send(this.$store.state.sessionId, this.transactionData)
       if (result.success) {
         this.error = false
         this.$emit('update-balance', this.transactionData.amount)
@@ -105,11 +99,12 @@ export default {
       this.currentTransactionStep = 2
     },
     onReset() {
-      this.transactionData.email = ''
-      this.transactionData.amount = 0
-      this.transactionData.memo = ''
-      this.transactionData.target_date = ''
-      this.showContext = true
+      this.transactionData = {
+        email: '',
+        amount: 0,
+        memo: '',
+        target_date: '',
+      }
       this.currentTransactionStep = 0
     },
   },
diff --git a/frontend/src/views/Pages/AccountOverview/GddSend.vue b/frontend/src/views/Pages/AccountOverview/GddSend.vue
index 53e0910c9..cfab0899a 100644
--- a/frontend/src/views/Pages/AccountOverview/GddSend.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddSend.vue
@@ -1,13 +1,18 @@
 <template>
   <div class="gdd-send">
-    <slot :name="currentTransactionStep" />
+    <slot :name="transactionSteps[currentTransactionStep]" />
   </div>
 </template>
 <script>
 export default {
   name: 'GddSend',
+  data() {
+    return {
+      transactionSteps: ['transaction-form', 'transaction-confirmation', 'transaction-result'],
+    }
+  },
   props: {
-    currentTransactionStep: { type: String, default: 'transaction-form' },
+    currentTransactionStep: { type: Number, default: 0 },
   },
 }
 </script>