diff --git a/src/views/admin-user-edit.pug b/src/views/admin-user-edit.pug
index c786933..3ccacaa 100644
--- a/src/views/admin-user-edit.pug
+++ b/src/views/admin-user-edit.pug
@@ -4,7 +4,7 @@ block title
   h1(style="margin-bottom: 0;")
     a(href='..') <
     | #{config.siteTitle}
-  p= lang('ADMIN_USER_EDIT_EDITING_USER', user._id)
+  p= lang('ADMIN_USER_EDIT_EDITING_USER', user._id.endsWith('_') ? user._id.replace(/_$/, ' (Guest)') : user._id)
 
 block content
   .columns
diff --git a/src/views/adminSettings.pug b/src/views/adminSettings.pug
index 7d42f8e..60460c5 100644
--- a/src/views/adminSettings.pug
+++ b/src/views/adminSettings.pug
@@ -3,7 +3,7 @@ extends layout.pug
 block content
   h2= lang('ADMIN_SETTINGS_USERS_HEADER')
   each user in users
-    span.is-size-6.inline= user.id
+    span.is-size-6.inline= user.id.endsWith('_') ? user.id.replace(/_$/, ' (Guest)') : user.id
     a(href=`${_CC.config.base}admin-settings/edit/${user.id}`)
       span.is-size-7.icon.has-text-info
         i.fas.fa-edit
diff --git a/src/views/wishlist.pug b/src/views/wishlist.pug
index 039d7dd..0a135a6 100644
--- a/src/views/wishlist.pug
+++ b/src/views/wishlist.pug
@@ -115,7 +115,7 @@ block content
                     if item.pledgedBy === '_CCUNKNOWN'
                       span.ugc=lang('WISHLIST_PLEDGED_GUEST')
                     else
-                      span.ugc=lang('WISHLIST_PLEDGED', item.pledgedBy)
+                      span.ugc=lang('WISHLIST_PLEDGED', item.pledgedBy.endsWith('_') ? item.pledgedBy.replace(/_$/, ' (Guest)') : item.pledgedBy)
               td(data-label='Delete Item')
                 form.inline(
                   method='POST',
diff --git a/src/views/wishlists.pug b/src/views/wishlists.pug
index f6771cc..9eca186 100644
--- a/src/views/wishlists.pug
+++ b/src/views/wishlists.pug
@@ -48,7 +48,7 @@ block content
     div!= _CC.config.customHtml.wishlists
 
   ul.noStyle.noLeftMargin
-    if req.user._id !== '_CCUNKNOWN'
+    if req.user._id !== '_CCUNKNOWN' && !req.user._id.endsWith('_')
       li
         .box
           a(href=`${_CC.config.base}wishlist/${req.user._id}`, style='color: #4a4a4a;')