diff --git a/pages/github/co-author.html b/pages/github/co-author.html
index 21597159..82bd0caf 100644
--- a/pages/github/co-author.html
+++ b/pages/github/co-author.html
@@ -152,8 +152,9 @@ <h1>GitHub Co-Author Generator</h1>
             );
           }
 
-          const coAuthorLine = `Co-authored-by: ${data.login} <${data.id}+${data.login}@users.noreply.github.com>`;
-          resultEditor.value = `\n\`\`\`\ncomment\n\n${coAuthorLine}\n\`\`\`\n`;
+          const coAuthorName = data.name ? data.name : data.login;
+          const coAuthorEmail = data.email ? data.email : `${data.id}+${data.login}@users.noreply.github.com>`;
+          resultEditor.value = `comment\n\nCo-authored-by: ${coAuthorName} <${coAuthorEmail}>\n`;
 
           // Update URL parameter
           const newUrl = new URL(window.location.href);