diff --git a/src/components/pdf_generation/GenerateRunnerCards.svelte b/src/components/pdf_generation/GenerateRunnerCards.svelte
index 58d11165..28078256 100644
--- a/src/components/pdf_generation/GenerateRunnerCards.svelte
+++ b/src/components/pdf_generation/GenerateRunnerCards.svelte
@@ -1,6 +1,10 @@
 <script>
     import { getLocaleFromNavigator, _ } from "svelte-i18n";
-    import { RunnerOrganizationService, RunnerTeamService } from "@odit/lfk-client-js";
+    import {
+        RunnerCardService,
+        RunnerOrganizationService,
+        RunnerTeamService,
+    } from "@odit/lfk-client-js";
     import Toastify from "toastify-js";
     export let cards_show = false;
     export let generate_cards = [];
@@ -24,11 +28,10 @@
             generateOrgCards(locale);
         } else if (generate_teams.length > 0) {
             generateTeamCards(locale);
-        } else if (generate_runners.length > 0){
-            generateRunnersContracts(locale);
-        }
-        else{
-            generateCards(locale)
+        } else if (generate_runners.length > 0) {
+            generateRunnersCards(locale);
+        } else {
+            generateCards(locale);
         }
     }
 
@@ -81,6 +84,62 @@
             });
     }
 
+    async function generateRunnersCards(locale) {
+        const toast = Toastify({
+            text: $_("generating-pdf"),
+            duration: -1,
+        }).showToast();
+        const current_cards = await RunnerCardService.runnerCardControllerGetAll();
+        let cards = []
+        for(let runner of generate_runners){
+            let card = current_cards.find((c)=>c.runner?.id == runner.id)
+            if(!card){
+                card = await RunnerCardService.runnerCardControllerPost({runner: runner.id});
+            }
+            cards.push(card);
+        }
+        fetch(
+            `${config.baseurl}/documents/cards?locale=${locale}&download=true&key=${config.documentserver_key}`,
+            {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                },
+                body: JSON.stringify(cards),
+            }
+        )
+            .then((response) => {
+                if (response.status != "200") {
+                    toast.hideToast();
+                    Toastify({
+                        text: $_("pdf-generation-failed"),
+                        duration: 3500,
+                        backgroundColor:
+                            "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
+                    }).showToast();
+                } else {
+                    return response.blob();
+                }
+            })
+            .then((blob) => {
+                const url = window.URL.createObjectURL(blob);
+                let a = document.createElement("a");
+                a.href = url;
+                a.download = "Runnercards.pdf";
+                document.body.appendChild(a);
+                a.click();
+                a.remove();
+                toast.hideToast();
+                    Toastify({
+                        text: $_("pdf-successfully-generated"),
+                        duration: 3500,
+                        backgroundColor:
+                            "linear-gradient(to right, #00b09b, #96c93d)",
+                    }).showToast();
+            })
+            .catch((err) => {});
+    }
+
     async function generateTeamCards(locale) {
         const toast = Toastify({
             text: $_("generating-pdfs"),
@@ -192,55 +251,6 @@
                 .catch((err) => {});
         }
     }
-
-    function generateRunnersContracts(locale) {
-        const toast = Toastify({
-            text: $_("generating-pdf"),
-            duration: -1,
-        }).showToast();
-        fetch(
-            `${config.baseurl}/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
-            {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                body: JSON.stringify(generate_runners),
-            }
-        )
-            .then((response) => {
-                if (response.status != "200") {
-                    toast.hideToast();
-                    Toastify({
-                        text: $_("pdf-generation-failed"),
-                        duration: 3500,
-                        backgroundColor:
-                            "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
-                    }).showToast();
-                } else {
-                    return response.blob();
-                }
-            })
-            .then((blob) => {
-                const url = window.URL.createObjectURL(blob);
-                let a = document.createElement("a");
-                a.href = url;
-                a.download = "Sponsoring.pdf";
-                document.body.appendChild(a);
-                a.click();
-                a.remove();
-                toast.hideToast();
-                Toastify({
-                    text: $_("pdf-successfully-generated"),
-                    duration: 3500,
-                    backgroundColor:
-                        "linear-gradient(to right, #00b09b, #96c93d)",
-                }).showToast();
-            })
-            .catch((err) => {
-                console.error(err);
-            });
-    }
 </script>
 
 {#if cards_show}
diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte
index 97787e9a..e2f9946d 100644
--- a/src/components/runners/RunnersOverview.svelte
+++ b/src/components/runners/RunnersOverview.svelte
@@ -9,6 +9,7 @@
   import RunnersEmptyState from "./RunnersEmptyState.svelte";
   import Select from "svelte-select";
   import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
+  import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
   $: searchvalue = "";
   $: active_deletes = [];
   export let current_runners = [];
@@ -23,6 +24,9 @@
   $: sponsoring_contracts_show = current_runners.some(
     (r) => r.is_selected === true
   );
+  $: cards_show = current_runners.some(
+    (r) => r.is_selected === true
+  );
   $: generate_runners = current_runners.filter((r) => r.is_selected === true);
   $: teams = [];
   $: orgs = [];
@@ -85,6 +89,9 @@
         <GenerateSponsoringContracts
           bind:sponsoring_contracts_show
           bind:generate_runners />
+        <GenerateRunnerCards
+          bind:cards_show
+          bind:generate_runners />
       </div>
       <div
         class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">