diff --git a/src/components/pdf_generation/GenerateRunnerCertificates.svelte b/src/components/pdf_generation/GenerateRunnerCertificates.svelte
index 5e6dd043..3eb366de 100644
--- a/src/components/pdf_generation/GenerateRunnerCertificates.svelte
+++ b/src/components/pdf_generation/GenerateRunnerCertificates.svelte
@@ -70,7 +70,12 @@
                 const url = window.URL.createObjectURL(blob);
                 let a = document.createElement("a");
                 a.href = url;
-                a.download = "Certificates.pdf";
+                if(generate_runners.length == 1){
+                    a.download = `Certificates_${generate_runners[0].firstname}_${generate_runners[0].lastname}_.pdf`;
+                }
+                else{
+                    a.download = `Certificates.pdf`;
+                }
                 document.body.appendChild(a);
                 a.click();
                 a.remove();
@@ -129,7 +134,7 @@
                     const url = window.URL.createObjectURL(blob);
                     let a = document.createElement("a");
                     a.href = url;
-                    a.download = "Certificates_" + t.name + ".pdf";
+                    a.download = `Certificates_${t.name}.pdf`;
                     document.body.appendChild(a);
                     a.click();
                     a.remove();
@@ -191,7 +196,7 @@
                     const url = window.URL.createObjectURL(blob);
                     let a = document.createElement("a");
                     a.href = url;
-                    a.download = "Certificates_" + o.name + ".pdf";
+                    a.download = `Certificates_${o.name}.pdf`;
                     document.body.appendChild(a);
                     a.click();
                     a.remove();