diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index fc4523718..76676c8c2 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -23,7 +23,7 @@
             {{ $d(new Date(contributionDate), 'monthAndYear') }}
           </div>
           <div class="mt-3 h5">{{ $t('contributionText') }}</div>
-          <div>{{ memo }}</div>
+          <div class="pb-3">{{ memo }}</div>
           <div v-if="state === 'IN_PROGRESS'" class="text-danger">
             {{ $t('contribution.alert.answerQuestion') }}
           </div>
diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index 2126dfa59..00102b77b 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -50,6 +50,7 @@
               <b-col>
                 <b-row>
                   <b-col cols="12">
+                    ::{{recipientEmail}}
                     <div v-if="radioSelected === sendTypes.send">
                       <input-email
                         :name="$t('form.recipient')"
diff --git a/frontend/src/components/Template/RightSide/LastTransactions.vue b/frontend/src/components/Template/RightSide/LastTransactions.vue
index c0895c358..35698d65f 100644
--- a/frontend/src/components/Template/RightSide/LastTransactions.vue
+++ b/frontend/src/components/Template/RightSide/LastTransactions.vue
@@ -24,7 +24,7 @@
               class="mr-3"
             ></b-avatar>
             <span class="mr-auto">
-              <name :linkedUser="transaction.linkedUser" v-on="$listeners" />
+              <name :linkedUser="transaction.linkedUser" @set-tunneled-email="setTunneledEmail" />
             </span>
             <b-badge>{{ transaction.amount | GDD }}</b-badge>
           </div>
@@ -48,5 +48,11 @@ export default {
     transactionCount: { type: Number, default: 0 },
     transactionLinkCount: { type: Number, default: 0 },
   },
+  methods: {
+    setTunneledEmail(email) {
+      console.log('setTunneledEmail LastTransaction', email)
+      this.$emit('set-tunneled-email', email)
+    },
+  },
 }
 </script>
diff --git a/frontend/src/components/TransactionRows/Name.vue b/frontend/src/components/TransactionRows/Name.vue
index a10ed3bc8..4ff0a95b7 100644
--- a/frontend/src/components/TransactionRows/Name.vue
+++ b/frontend/src/components/TransactionRows/Name.vue
@@ -5,15 +5,6 @@
         <b-link @click.stop="tunnelEmail">
           {{ itemText }}
         </b-link>
-        <!-- <span v-if="transactionLinkId">
-          {{ $t('via_link') }}
-          <b-icon
-            icon="link45deg"
-            variant="muted"
-            class="m-mb-1"
-            :title="$t('gdd_per_link.redeemed-title')"
-          />
-        </span> -->
       </div>
       <span v-else>{{ itemText }}</span>
     </div>
@@ -31,16 +22,17 @@ export default {
       type: String,
       required: false,
     },
-    // transactionLinkId: {
-    //   type: Number,
-    //   required: false,
-    //   default: null,
-    // },
+    linkId: {
+      type: Number,
+      required: false,
+      default: null,
+    },
   },
   methods: {
     tunnelEmail() {
+      console.log('tunnelEmail name', this.linkedUser.email)
       this.$emit('set-tunneled-email', this.linkedUser.email)
-      this.$router.push({ path: '/send' })
+      if (this.$router.history.current.fullPath !== '/send') this.$router.push({ path: '/send' })
     },
   },
   computed: {
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 9c4784e46..bb96649f9 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -11,15 +11,27 @@
             v-on="$listeners"
             :amount="amount"
             :linkedUser="linkedUser"
-            :transactionLinkId="transactionLinkId"
+            :linkId="linkId"
           />
         </div>
         <div class="small">{{ this.$d(new Date(balanceDate), 'short') }}</div>
         <div class="small">{{ this.$d(new Date(balanceDate), 'time') }}</div>
       </b-col>
       <b-col cols="3">
-        <div class="small">{{ $t('decay.types.receive') }}</div>
+        <div class="small">
+          {{ $t('decay.types.receive') }}
+          
+        </div>
         <div class="font-weight-bold">{{ amount | GDD }}</div>
+        <div v-if="linkId" class="small">
+            {{ $t('via_link') }}
+            <b-icon
+              icon="link45deg"
+              variant="muted"
+              class="m-mb-1"
+              :title="$t('gdd_per_link.redeemed-title')"
+            />
+          </div>
       </b-col>
       <b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col>
     </b-row>
@@ -76,7 +88,7 @@ export default {
       type: String,
       required: true,
     },
-    transactionLinkId: {
+    linkId: {
       type: Number,
       required: false,
       default: null,
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index 3f1d2351b..801a569f1 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -11,15 +11,27 @@
             v-on="$listeners"
             :amount="amount"
             :linkedUser="linkedUser"
-            :transactionLinkId="transactionLinkId"
+            :linkId="linkId"
           />
         </div>
         <div class="small">{{ this.$d(new Date(balanceDate), 'short') }}</div>
         <div class="small">{{ this.$d(new Date(balanceDate), 'time') }}</div>
       </b-col>
       <b-col cols="3">
-        <div class="small">{{ $t('decay.types.send') }}</div>
+        <div class="small">
+          {{ $t('decay.types.send') }}
+          
+        </div>
         <div class="font-weight-bold">{{ amount | GDD }}</div>
+        <div v-if="linkId" class="small">
+            {{ $t('via_link') }}
+            <b-icon
+              icon="link45deg"
+              variant="muted"
+              class="m-mb-1"
+              :title="$t('gdd_per_link.redeemed-title')"
+            />
+          </div>
       </b-col>
       <b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col>
     </b-row>
@@ -77,7 +89,7 @@ export default {
       type: String,
       required: true,
     },
-    transactionLinkId: {
+    linkId: {
       type: Number,
       required: false,
       default: null,
diff --git a/frontend/src/layouts/DashboardLayout.vue b/frontend/src/layouts/DashboardLayout.vue
index b2532483c..e7c0432fe 100755
--- a/frontend/src/layouts/DashboardLayout.vue
+++ b/frontend/src/layouts/DashboardLayout.vue
@@ -215,6 +215,7 @@ export default {
       this.visible = bool
     },
     setTunneledEmail(email) {
+      console.log('setTunneledEmail dashboard', email)
       this.tunneledEmail = email
     },
     // toogleMobilMenu() {
diff --git a/frontend/src/layouts/templates/RightSide.vue b/frontend/src/layouts/templates/RightSide.vue
index 8ee92b117..99cf3a3df 100644
--- a/frontend/src/layouts/templates/RightSide.vue
+++ b/frontend/src/layouts/templates/RightSide.vue
@@ -15,7 +15,7 @@
               :transactions="transactions"
               :transactionCount="transactionCount"
               :transactionLinkCount="transactionLinkCount"
-              v-on="$listeners"
+              @set-tunneled-email="setTunneledEmail"
             />
           </div>
         </b-col>
@@ -154,5 +154,11 @@ export default {
       return this.$route.path
     },
   },
+  methods: {
+    setTunneledEmail(email) {
+      console.log('setTunneledEmail rightside', email)
+      this.$emit('set-tunneled-email', email)
+    },
+  },
 }
 </script>