diff --git a/app/models/notification.rb b/app/models/notification.rb
index 7adb5ce665d..8cd35dd7698 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -109,7 +109,7 @@ class Notification < ActiveRecord::Base
                         chat_mention: 29,
                         chat_message: 30,
                         chat_invitation: 31,
-                        chat_group_mention: 32,
+                        chat_group_mention: 32, # March 2022 - This is obsolete, as all chat_mentions use `chat_mention` type
                         chat_quoted: 33
                        )
   end
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 9af6fb3ec47..794c70ba634 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -554,7 +554,7 @@ users:
   reserved_usernames:
     type: list
     list_type: compact
-    default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum|support"
+    default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum|support|all|here"
   min_password_length:
     client: true
     default: 10