diff --git a/src/components/donations/AddDonationModal.svelte b/src/components/donations/AddDonationModal.svelte
index 091cd8fb..f6858e6d 100644
--- a/src/components/donations/AddDonationModal.svelte
+++ b/src/components/donations/AddDonationModal.svelte
@@ -209,7 +209,7 @@
                     {#each donors as d}
                       <option value={d.id}>
                         {d.firstname}
-                        {d.middlename}
+                        {d.middlename || ''}
                         {d.lastname}
                       </option>
                     {/each}
@@ -226,7 +226,7 @@
                       {#each runners as r}
                         <option value={r.id}>
                           {r.firstname}
-                          {r.middlename}
+                          {r.middlename || ''}
                           {r.lastname}
                         </option>
                       {/each}
diff --git a/src/components/donations/DonationDetail.svelte b/src/components/donations/DonationDetail.svelte
index cb173d17..3c770589 100644
--- a/src/components/donations/DonationDetail.svelte
+++ b/src/components/donations/DonationDetail.svelte
@@ -207,7 +207,7 @@
         {#each current_donors as d}
           <option value={d.id}>
             {d.firstname}
-            {d.middlename}
+            {d.middlename || ''}
             {d.lastname}
           </option>
         {/each}
@@ -224,7 +224,7 @@
           {#each current_runners as r}
             <option value={r.id}>
               {r.firstname}
-              {r.middlename}
+              {r.middlename || ''}
               {r.lastname}
             </option>
           {/each}
diff --git a/src/components/donors/DonorDetail.svelte b/src/components/donors/DonorDetail.svelte
index 00dd793b..c42504b0 100644
--- a/src/components/donors/DonorDetail.svelte
+++ b/src/components/donors/DonorDetail.svelte
@@ -212,7 +212,7 @@
                 .toLocaleString('de-DE', { valute: 'EUR' })}€</a>
           {/if}
         {/each}
-      {:else}Donor has no associated donations.{/if}
+      {:else}{$_('donor-has-no-associated-donations')}{/if}
     </div>
     <div class=" w-full">
       <label