diff --git a/app/assets/javascripts/discourse/app/components/flag-action-type.js b/app/assets/javascripts/discourse/app/components/flag-action-type.js
index 7c9fe6d97ab..4e4d8cc89aa 100644
--- a/app/assets/javascripts/discourse/app/components/flag-action-type.js
+++ b/app/assets/javascripts/discourse/app/components/flag-action-type.js
@@ -17,14 +17,9 @@ export default Component.extend({
     return I18n.t("flagging.custom_placeholder_" + nameKey);
   },
 
-  @discourseComputed(
-    "flag.name",
-    "flag.name_key",
-    "flag.is_custom_flag",
-    "username"
-  )
-  formattedName(name, nameKey, isCustomFlag, username) {
-    if (isCustomFlag) {
+  @discourseComputed("flag.name", "flag.name_key", "username")
+  formattedName(name, nameKey, username) {
+    if (["notify_user", "notify_moderators"].includes(nameKey)) {
       return name.replace(/{{username}}|%{username}/, username);
     } else {
       return I18n.t("flagging.formatted_name." + nameKey);
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 829b4e1efc4..1b57f0d2500 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -965,7 +965,7 @@ en:
       description: 'This post contains content that a reasonable person would consider offensive, abusive, to be hateful conduct or a violation of <a href="%{base_path}/guidelines">our community guidelines</a>.'
       short_description: 'A violation of <a href="%{base_path}/guidelines">our community guidelines</a>'
     illegal:
-      title: "It's Illegal"
+      title: "Illegal"
       description: "This post requires staff attention because I believe it contains content that is illegal."
       short_description: "This is illegal"
       email_title: 'A post in "%{title}" requires staff attention'
@@ -1053,7 +1053,7 @@ en:
       email_title: 'The topic "%{title}" requires moderator attention'
       email_body: "%{link}\n\n%{message}"
     illegal:
-      title: "It's Illegal"
+      title: "Illegal"
       description: "This topic requires staff attention because I believe it contains content that is illegal."
       short_description: "This is illegal"
       email_title: 'A post in "%{title}" requires staff attention'
@@ -3013,6 +3013,7 @@ en:
   flag_reasons:
     off_topic: "Your post was flagged as **off-topic**: the community feels it is not a good fit for the topic, as currently defined by the title and the first post."
     inappropriate: "Your post was flagged as **inappropriate**: the community feels it is offensive, abusive, to be hateful conduct or a violation of [our community guidelines](%{base_path}/guidelines)."
+    illegal: "Your post was flagged as  **illegal**: the community thinks it might be breaking the law."
     spam: "Your post was flagged as **spam**: the community feels it is an advertisement, something that is overly promotional in nature instead of being useful or relevant to the topic as expected."
     notify_moderators: "Your post was flagged **for moderator attention**: the community feels something about the post requires manual intervention by a staff member."
     responder: