diff --git a/api-server/src/server/boot/certificate.js b/api-server/src/server/boot/certificate.js
index d49d320532c..b7cd6127795 100644
--- a/api-server/src/server/boot/certificate.js
+++ b/api-server/src/server/boot/certificate.js
@@ -469,7 +469,9 @@ function createShowCert(app) {
         });
       }
 
-      if (!user.name) {
+      // If the user does not have a name, and have set their name to public,
+      // warn them. Otherwise, fallback to username
+      if (!user.name && user.showName) {
         return res.json({
           messages: [
             {