diff --git a/frontend/src/components/TransactionRows/AmountAndNameRow.vue b/frontend/src/components/TransactionRows/AmountAndNameRow.vue
index 322ad7dfa..96a31dcf3 100644
--- a/frontend/src/components/TransactionRows/AmountAndNameRow.vue
+++ b/frontend/src/components/TransactionRows/AmountAndNameRow.vue
@@ -10,21 +10,21 @@
       </b-col>
       <b-col cols="7">
         <div class="gdd-transaction-list-item-name">
-          <div v-if="linkedUser && linkedUser.email">
+          <span v-if="linkedUser && linkedUser.email">
             <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>
           <span v-else>{{ itemText }}</span>
+          <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>
       </b-col>
     </b-row>
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index 694d907ed..a832b9b1a 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -12,7 +12,12 @@
 
           <b-col cols="11">
             <!-- Amount / Name || Text -->
-            <amount-and-name-row :amount="amount" :linkedUser="linkedUser" v-on="$listeners" />
+            <amount-and-name-row
+              :amount="amount"
+              :linkedUser="linkedUser"
+              v-on="$listeners"
+              :transactionLinkId="transactionLinkId"
+            />
 
             <!-- Nachricht Memo -->
             <memo-row :memo="memo" />
@@ -77,6 +82,10 @@ export default {
       type: String,
       required: true,
     },
+    transactionLinkId: {
+      type: Number,
+      required: false,
+    },
     previousBookedBalance: {
       type: String,
       required: true,