diff --git a/src/tools/csr-generator/csr-generator.service.ts b/src/tools/csr-generator/csr-generator.service.ts
index b1dff842..f4da0d34 100644
--- a/src/tools/csr-generator/csr-generator.service.ts
+++ b/src/tools/csr-generator/csr-generator.service.ts
@@ -57,7 +57,7 @@ async function generateCSR(config: {
   }, {
     name: 'emailAddress',
     value: config.contactEmail,
-  }].filter(attr => attr.value));
+  }].filter(attr => attr.value !== null && attr.value?.trim() !== ''));
 
   // sign certification request
   csr.sign(privateKey);
diff --git a/src/tools/csr-generator/csr-generator.vue b/src/tools/csr-generator/csr-generator.vue
index d63a540f..d0830681 100644
--- a/src/tools/csr-generator/csr-generator.vue
+++ b/src/tools/csr-generator/csr-generator.vue
@@ -158,7 +158,7 @@ const [certs, refreshCerts] = computedRefreshableAsync(
 
     <div v-if="commonNameValidation.isValid">
       <div>
-        <h3>Certifacate Signing Request</h3>
+        <h3>Certificate Signing Request</h3>
         <TextareaCopyable :value="certs.csrPem" />
       </div>