diff --git a/src/components/pdf_generation/DocumentServer.ts b/src/components/pdf_generation/DocumentServer.ts
index e5e8eedd..e0a24c57 100644
--- a/src/components/pdf_generation/DocumentServer.ts
+++ b/src/components/pdf_generation/DocumentServer.ts
@@ -100,6 +100,7 @@ class DocumentServer {
         first_name: runners[i].firstname,
         middle_name: runners[i].middlename,
         last_name: runners[i].lastname,
+        self_service_link: runners[i].selfserviceLink,
         group: {
           id: runners[i].group.id,
           name: runners[i].group.name,
diff --git a/src/components/pdf_generation/GenerateRunnerCertificates.svelte b/src/components/pdf_generation/GenerateRunnerCertificates.svelte
index 326f9159..b7eb4aae 100644
--- a/src/components/pdf_generation/GenerateRunnerCertificates.svelte
+++ b/src/components/pdf_generation/GenerateRunnerCertificates.svelte
@@ -1,175 +1,180 @@
 <script>
-	import { _ } from "svelte-i18n";
-	import {
-		DonationService,
-		RunnerTeamService,
-		RunnerOrganizationService,
-	} from "@odit/lfk-client-js";
-	import { init } from "@paralleldrive/cuid2";
-	import toast from "svelte-french-toast";
-	import DocumentServer from "./DocumentServer";
-	const createId = init({ length: 10, fingerprint: "lfk-frontend" });
-	const documentServer = new DocumentServer(
-		config.baseurl_documentserver,
-		config.documentserver_key
-	);
+  import { _ } from "svelte-i18n";
+  import {
+    DonationService,
+    RunnerTeamService,
+    RunnerOrganizationService,
+	RunnerService
+  } from "@odit/lfk-client-js";
+  import { init } from "@paralleldrive/cuid2";
+  import toast from "svelte-french-toast";
+  import DocumentServer from "./DocumentServer";
+  const createId = init({ length: 10, fingerprint: "lfk-frontend" });
+  const documentServer = new DocumentServer(
+    config.baseurl_documentserver,
+    config.documentserver_key
+  );
 
-	export let certificates_show = false;
-	export let generate_runners = [];
-	export let generate_orgs = [];
-	export let generate_teams = [];
+  export let certificates_show = false;
+  export let generate_runners = [];
+  export let generate_orgs = [];
+  export let generate_teams = [];
 
-	function generateCertificates(locale) {
-		if (generate_orgs.length > 0) {
-			generateOrgCertificates(locale);
-		} else if (generate_teams.length > 0) {
-			generateTeamCertificates(locale);
-		} else {
-			generateRunnerCertificates(locale);
-		}
-	}
-	function download(blob, fileName) {
-		const url = window.URL.createObjectURL(blob);
-		let a = document.createElement("a");
-		a.href = url;
-		a.download = fileName;
-		document.body.appendChild(a);
-		a.click();
-		a.remove();
-		toast.dismiss();
-		toast.success($_("pdf-successfully-generated"));
-	}
+  function generateCertificates(locale) {
+    if (generate_orgs.length > 0) {
+      generateOrgCertificates(locale);
+    } else if (generate_teams.length > 0) {
+      generateTeamCertificates(locale);
+    } else {
+      generateRunnerCertificates(locale);
+    }
+  }
+  function download(blob, fileName) {
+    const url = window.URL.createObjectURL(blob);
+    let a = document.createElement("a");
+    a.href = url;
+    a.download = fileName;
+    document.body.appendChild(a);
+    a.click();
+    a.remove();
+    toast.dismiss();
+    toast.success($_("pdf-successfully-generated"));
+  }
 
-	async function generateRunnerCertificates(locale) {
-		toast.loading($_("generating-pdf"));
-		const current_donations =
-			(await DonationService.donationControllerGetAll()) || [];
-		let certificateRunners = [];
-		for (let runner of generate_runners) {
-			runner.distanceDonations =
-				current_donations.filter((d) => d.runner?.id == runner.id) || [];
-			certificateRunners.push(runner);
-		}
-		documentServer
-			.generateCertificates(certificateRunners, locale)
-			.then((blob) => {
-				let fileName = `${$_("certificates")}-${locale}.pdf`;
-				if (generate_runners.length == 1) {
-					fileName = `${$_("certificates")}_${
-						generate_runners[0].firstname
-					}_${generate_runners[0].lastname}-${locale}-${createId()}.pdf`;
-				}
-				download(blob, fileName);
-			})
-			.catch((err) => {});
-	}
+  async function generateRunnerCertificates(locale) {
+    toast.loading($_("generating-pdf"));
+    const current_donations =
+      (await DonationService.donationControllerGetAll()) || [];
+    let certificateRunners = [];
+    for (let runner of generate_runners) {
+	  const linkRunner = await RunnerService.runnerControllerGetOne(runner.id)
+      linkRunner.distanceDonations =
+        current_donations.filter((d) => d.runner?.id == runner.id) || [];
+      certificateRunners.push(linkRunner);
+    }
+    documentServer
+      .generateCertificates(certificateRunners, locale)
+      .then((blob) => {
+        let fileName = `${$_("certificates")}-${locale}.pdf`;
+        if (generate_runners.length == 1) {
+          fileName = `${$_("certificates")}_${
+            generate_runners[0].firstname
+          }_${generate_runners[0].lastname}-${locale}-${createId()}.pdf`;
+        }
+        download(blob, fileName);
+      })
+      .catch((err) => {});
+  }
 
-	async function generateTeamCertificates(locale) {
-		toast.loading($_("generating-pdfs"));
-		let count = 0;
-		const current_donations =
-			(await DonationService.donationControllerGetAll()) || [];
-		for (const t of generate_teams) {
-			const runners = await RunnerTeamService.runnerTeamControllerGetRunners(
-				t.id
-			);
-			let certificateRunners = [];
-			for (let runner of runners) {
-				runner.distanceDonations =
-					current_donations.filter((d) => d.runner?.id == runner.id) || [];
-				certificateRunners.push(runner);
-			}
-			documentServer
-				.generateCertificates(certificateRunners, locale)
-				.then((blob) => {
-					count++;
-					download(
-						blob,
-						`${$_("certificates")}_${t.name}-${locale}-${createId()}.pdf`
-					);
-				})
-				.catch((err) => {});
-		}
-	}
+  async function generateTeamCertificates(locale) {
+    toast.loading($_("generating-pdfs"));
+    let count = 0;
+    const current_donations =
+      (await DonationService.donationControllerGetAll()) || [];
+    for (const t of generate_teams) {
+      const runners = await RunnerTeamService.runnerTeamControllerGetRunners(
+        t.id,
+        true
+      );
+      let certificateRunners = [];
+      for (let runner of runners) {
+        runner.distanceDonations =
+          current_donations.filter((d) => d.runner?.id == runner.id) || [];
+        certificateRunners.push(runner);
+      }
+      documentServer
+        .generateCertificates(certificateRunners, locale)
+        .then((blob) => {
+          count++;
+          download(
+            blob,
+            `${$_("certificates")}_${t.name}-${locale}-${createId()}.pdf`
+          );
+        })
+        .catch((err) => {});
+    }
+  }
 
-	async function generateOrgCertificates(locale) {
-		toast.loading($_("generating-pdfs"));
-		const current_donations =
-			(await DonationService.donationControllerGetAll()) || [];
-		let count = 0;
-		let count_orgs = 0;
-		for (const o of generate_orgs) {
-			count_orgs++;
-			let count = 0;
-			let runners =
-				await RunnerOrganizationService.runnerOrganizationControllerGetRunners(
-					o.id,
-					true
-				);
-			let certificateRunners = [];
-			for (let runner of runners) {
-				runner.distanceDonations =
-					current_donations.filter((d) => d.runner?.id == runner.id) || [];
-				certificateRunners.push(runner);
-			}
-			await documentServer
-				.generateCertificates(certificateRunners, locale)
-				.then((blob) => {
-					download(
-						blob,
-						`${$_("certificates")}_${o.name}-${locale}-${createId()}.pdf`
-					);
-				})
-				.catch((err) => {});
-			for (const t of o.teams) {
-				count++;
-				let runners = await RunnerTeamService.runnerTeamControllerGetRunners(
-					t.id
-				);
-				let certificateRunners = [];
-				for (let runner of runners) {
-					runner.distanceDonations =
-						current_donations.filter((d) => d.runner?.id == runner.id) || [];
-					certificateRunners.push(runner);
-				}
-				await documentServer
-					.generateCertificates(certificateRunners, locale)
-					.then((blob) => {
-						download(
-							blob,
-							`${$_("certificates")}_${o.name}_${
-								t.name
-							}-${locale}-${createId()}.pdf`
-						);
-						if (
-							count === o.teams.length &&
-							count_orgs === generate_orgs.length
-						) {
-							toast.dismiss();
-							toast.success($_("pdfs-successfully-generated"));
-						}
-					})
-					.catch((err) => {});
-			}
-		}
-	}
+  async function generateOrgCertificates(locale) {
+    toast.loading($_("generating-pdfs"));
+    const current_donations =
+      (await DonationService.donationControllerGetAll()) || [];
+    let count = 0;
+    let count_orgs = 0;
+    for (const o of generate_orgs) {
+      count_orgs++;
+      let count = 0;
+      let runners =
+        await RunnerOrganizationService.runnerOrganizationControllerGetRunners(
+          o.id,
+          true,
+		  true
+        );
+      let certificateRunners = [];
+      for (let runner of runners) {
+        runner.distanceDonations =
+          current_donations.filter((d) => d.runner?.id == runner.id) || [];
+        certificateRunners.push(runner);
+      }
+      await documentServer
+        .generateCertificates(certificateRunners, locale)
+        .then((blob) => {
+          download(
+            blob,
+            `${$_("certificates")}_${o.name}-${locale}-${createId()}.pdf`
+          );
+        })
+        .catch((err) => {});
+      for (const t of o.teams) {
+        count++;
+        let runners = await RunnerTeamService.runnerTeamControllerGetRunners(
+          t.id,
+		  true
+        );
+        let certificateRunners = [];
+        for (let runner of runners) {
+          runner.distanceDonations =
+            current_donations.filter((d) => d.runner?.id == runner.id) || [];
+          certificateRunners.push(runner);
+        }
+        await documentServer
+          .generateCertificates(certificateRunners, locale)
+          .then((blob) => {
+            download(
+              blob,
+              `${$_("certificates")}_${o.name}_${
+                t.name
+              }-${locale}-${createId()}.pdf`
+            );
+            if (
+              count === o.teams.length &&
+              count_orgs === generate_orgs.length
+            ) {
+              toast.dismiss();
+              toast.success($_("pdfs-successfully-generated"));
+            }
+          })
+          .catch((err) => {});
+      }
+    }
+  }
 </script>
 
 {#if certificates_show}
-	<button
-		on:click={() => {
-			generateCertificates("de");
-		}}
-		class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
-	>
-		{$_("generate-runner-certificates")}: DE
-	</button>
-	<button
-		on:click={() => {
-			generateCertificates("en");
-		}}
-		class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
-	>
-		{$_("generate-runner-certificates")}: EN
-	</button>
+  <button
+    on:click={() => {
+      generateCertificates("de");
+    }}
+    class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
+  >
+    {$_("generate-runner-certificates")}: DE
+  </button>
+  <button
+    on:click={() => {
+      generateCertificates("en");
+    }}
+    class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
+  >
+    {$_("generate-runner-certificates")}: EN
+  </button>
 {/if}
diff --git a/yarn.lock b/yarn.lock
index 3c9fae40..052e4f09 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -491,10 +491,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@odit/lfk-client-js@npm:1.1.3":
-  version: 1.1.3
-  resolution: "@odit/lfk-client-js@npm:1.1.3"
-  checksum: 10c0/c5108400dc40b6eb5d4c467238c178779454bf46301559034fbfd2d7666e863af5d5df8208b501ec6dad1b97994e2005d879f2d5b5f3e0439f01f34ecd97f895
+"@odit/lfk-client-js@npm:1.2.4":
+  version: 1.2.4
+  resolution: "@odit/lfk-client-js@npm:1.2.4"
+  checksum: 10c0/503b3eec7fe66f8d42b137660fd5a7cda2f067c6c79fbe3c15613fb7a06284adb3e186a645f8e48c6de015fb2c8c0a42074551201fd0244215e8ba444dfe17e2
   languageName: node
   linkType: hard
 
@@ -503,7 +503,7 @@ __metadata:
   resolution: "@odit/lfk-frontend@workspace:."
   dependencies:
     "@fontsource/athiti": "npm:^5.2.5"
-    "@odit/lfk-client-js": "npm:1.1.3"
+    "@odit/lfk-client-js": "npm:1.2.4"
     "@odit/license-exporter": "npm:0.2.0"
     "@paralleldrive/cuid2": "npm:2.2.2"
     "@sveltejs/vite-plugin-svelte": "npm:2.1.1"
@@ -513,6 +513,7 @@ __metadata:
     bwip-js: "npm:3.4.0"
     check-password-strength: "npm:2.0.10"
     csvtojson: "npm:2.0.10"
+    html5-qrcode: "npm:^2.3.8"
     localforage: "npm:1.10.0"
     marked: "npm:4.3.0"
     postcss: "npm:8.5.3"
@@ -2032,6 +2033,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"html5-qrcode@npm:^2.3.8":
+  version: 2.3.8
+  resolution: "html5-qrcode@npm:2.3.8"
+  checksum: 10c0/3d7d0b3687e41a6fc0a06345f67e89ad3c7c00a3d0d8846d6fd31985e1ed2ac1c310e625f0b650dbc689f6b83469e3378417e7431ae5a9194178f1172bf6a93a
+  languageName: node
+  linkType: hard
+
 "http-cache-semantics@npm:^4.1.1":
   version: 4.1.1
   resolution: "http-cache-semantics@npm:4.1.1"