diff --git a/source/templates/classic/partials/followup.ejs b/source/templates/classic/partials/followup.ejs
index 1c894110..088856ab 100644
--- a/source/templates/classic/partials/followup.ejs
+++ b/source/templates/classic/partials/followup.ejs
@@ -16,7 +16,7 @@
     <% for (const name of plugins.followup.sections) { const section = {repositories:plugins.followup, user:plugins.followup?.user}[name] %>
       <div class="column largeable">
         <h3>
-          <%= {repositories:`On ${user.login}'${[...user.login].pop() === "s" ? "" : "s"} repositories`, user:`Created by ${user.login}`}[name] %>
+          <%= {repositories:`On ${user.name ?? user.login}'s repositories`, user:`Created by ${user.name ?? user.login}`}[name] %>
         </h3>
         <div class="row fill-width">
           <section class="column">
@@ -70,4 +70,4 @@
       </div>
     <% } %>
   <% } %>
-<% } %>
\ No newline at end of file
+<% } %>