diff --git a/abstracto-modules/core/src/main/resources/en_US/builtins/user_detail_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/builtins/user_detail_en_US.ftl
index 204bdf61..9175b976 100644
--- a/abstracto-modules/core/src/main/resources/en_US/builtins/user_detail_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/builtins/user_detail_en_US.ftl
@@ -1 +1 @@
-<#macro user_detail user>${user.name?json_string}<#if user.discriminator?number gt 0>#${user.discriminator}</#if> (${user.idLong?c})</#macro>
+<#macro user_detail user><#if user.name?has_content>${user.name?json_string}<#if user.discriminator?has_content && user.discriminator != '0000'>#${user.discriminator}</#if><#else>${user.userMention}</#if> (${user.id?c})</#macro>
diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl
deleted file mode 100644
index ac853537..00000000
--- a/abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "embeds": [
-        {
-            "title": {
-                "title": "<@safe_include "ban_log_title"/>"
-            },
-            <#include "moderation_action_color">,
-            "fields": [
-                {
-                    "name": "<@safe_include "ban_log_banned_user_field_title"/>",
-                    "value": "${bannedUser.userMention}"
-                },
-                {
-                    "name": "<@safe_include "ban_log_banning_user_field_title"/>",
-                    "value": "${banningMember.memberMention}"
-                },
-                {
-                    "name": "<@safe_include "ban_log_reason_field_title"/>",
-                    "value": "${reason?json_string}"
-                }
-                <#if deletionDuration?has_content>
-                ,
-                {
-                    "name": "<@safe_include "ban_log_deletion_duration_field_title"/>",
-                    "value": "${fmtDuration(deletionDuration)}"
-                }
-                </#if>
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/unBan/unBan_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/unBan/unBan_log_embed_en_US.ftl
deleted file mode 100644
index 3e0da428..00000000
--- a/abstracto-modules/moderation/src/main/resources/en_US/command/unBan/unBan_log_embed_en_US.ftl
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "embeds": [
-        {
-            "title": {
-                "title": "<@safe_include "unBan_log_title"/>"
-            },
-            <#include "moderation_action_color">,
-            "fields": [
-                {
-                    "name": "<@safe_include "unBan_log_un_banned_user_field_title"/>",
-                    "value": "${bannedUser.userMention}"
-                },
-                {
-                    "name": "<@safe_include "unBan_log_un_banning_user_field_title"/>",
-                    "value": "${unBanningMember.memberMention}"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/abstracto-modules/moderation/src/main/resources/en_US/general/infractions/infraction_level_notification_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/general/infractions/infraction_level_notification_embed_en_US.ftl
index 1b0f3b54..7d969b68 100644
--- a/abstracto-modules/moderation/src/main/resources/en_US/general/infractions/infraction_level_notification_embed_en_US.ftl
+++ b/abstracto-modules/moderation/src/main/resources/en_US/general/infractions/infraction_level_notification_embed_en_US.ftl
@@ -1,7 +1,6 @@
 {
     "embeds": [
         {
-            <#include "user_detail">
             <#include "full_member_info">
             <#include "moderation_action_color">,
             <#assign newLevel=newLevel>
diff --git a/abstracto-modules/moderation/src/main/resources/en_US/listener/userBanned/userBanned_listener_notification_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/listener/userBanned/userBanned_listener_notification_embed_en_US.ftl
index 466a50c3..714fde1e 100644
--- a/abstracto-modules/moderation/src/main/resources/en_US/listener/userBanned/userBanned_listener_notification_embed_en_US.ftl
+++ b/abstracto-modules/moderation/src/main/resources/en_US/listener/userBanned/userBanned_listener_notification_embed_en_US.ftl
@@ -3,8 +3,12 @@
         {
             <#include "user_detail">
             <#include "abstracto_color">,
-            <#assign bannedUserName=bannedUser.name>
-            "description" : "<@safe_include "userBanned_description"/>",
+            <#if bannedUser.name?has_content>
+                <#assign bannedUserName=bannedUser.name>
+                "description" : "<@safe_include "userBanned_description_with_name"/>",
+            <#else>
+                "description" : "<@safe_include "userBanned_description"/>",
+            </#if>
             "fields": [
                 {
                     "name": "<@safe_include "userBanned_field_title_banned_user"/>",
diff --git a/abstracto-modules/moderation/src/main/resources/en_US/listener/userUnBanned/userUnBanned_listener_notification_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/listener/userUnBanned/userUnBanned_listener_notification_embed_en_US.ftl
index 1f78220e..b5ab1b08 100644
--- a/abstracto-modules/moderation/src/main/resources/en_US/listener/userUnBanned/userUnBanned_listener_notification_embed_en_US.ftl
+++ b/abstracto-modules/moderation/src/main/resources/en_US/listener/userUnBanned/userUnBanned_listener_notification_embed_en_US.ftl
@@ -16,6 +16,13 @@
                     "value": "<@user_detail user=unBanningUser/>"
                 }
                 </#if>
+                <#if reason??>
+                ,
+                {
+                "name": "<@safe_include "userUnBanned_field_title_reason"/>",
+                "value": "${reason}"
+                }
+                </#if>
             ]
         }
     ]
diff --git a/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_banned_user_field_title_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_banned_user_field_title_en_US.ftl
deleted file mode 100644
index e085edf2..00000000
--- a/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_banned_user_field_title_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-Banned user
\ No newline at end of file
diff --git a/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_banning_user_field_title_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_banning_user_field_title_en_US.ftl
deleted file mode 100644
index 5add7ba5..00000000
--- a/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_banning_user_field_title_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-Banned by
\ No newline at end of file
diff --git a/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_deletion_duration_field_title_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_deletion_duration_field_title_en_US.ftl
deleted file mode 100644
index 2ef57ab4..00000000
--- a/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_deletion_duration_field_title_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-Deletion duration
\ No newline at end of file
diff --git a/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_jump_link_field_title_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_jump_link_field_title_en_US.ftl
deleted file mode 100644
index 75dba258..00000000
--- a/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_jump_link_field_title_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-Link
\ No newline at end of file
diff --git a/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_title_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_title_en_US.ftl
deleted file mode 100644
index f254b7f5..00000000
--- a/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_title_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-User has been banned.
\ No newline at end of file
diff --git a/translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_title_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_title_en_US.ftl
deleted file mode 100644
index 7154bd73..00000000
--- a/translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_title_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-User has been unbanned
\ No newline at end of file
diff --git a/translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_un_banned_user_field_title_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_un_banned_user_field_title_en_US.ftl
deleted file mode 100644
index f93d6c29..00000000
--- a/translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_un_banned_user_field_title_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-Unbanned user
\ No newline at end of file
diff --git a/translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_un_banning_user_field_title_en_US.ftl b/translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_un_banning_user_field_title_en_US.ftl
deleted file mode 100644
index 2fae6cd8..00000000
--- a/translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_un_banning_user_field_title_en_US.ftl
+++ /dev/null
@@ -1 +0,0 @@
-Unbanning user
\ No newline at end of file
diff --git a/translations/moderation/src/main/resources/en_US/listener/userBanned/userBanned_description_en_US.ftl b/translations/moderation/src/main/resources/en_US/listener/userBanned/userBanned_description_en_US.ftl
index 2e692a7a..ab9ae2ba 100644
--- a/translations/moderation/src/main/resources/en_US/listener/userBanned/userBanned_description_en_US.ftl
+++ b/translations/moderation/src/main/resources/en_US/listener/userBanned/userBanned_description_en_US.ftl
@@ -1 +1 @@
-User ${bannedUserName} was banned.
\ No newline at end of file
+User was banned.
\ No newline at end of file
diff --git a/translations/moderation/src/main/resources/en_US/listener/userBanned/userBanned_description_with_name_en_US.ftl b/translations/moderation/src/main/resources/en_US/listener/userBanned/userBanned_description_with_name_en_US.ftl
new file mode 100644
index 00000000..2e692a7a
--- /dev/null
+++ b/translations/moderation/src/main/resources/en_US/listener/userBanned/userBanned_description_with_name_en_US.ftl
@@ -0,0 +1 @@
+User ${bannedUserName} was banned.
\ No newline at end of file
diff --git a/translations/moderation/src/main/resources/en_US/commands/ban/ban_log_reason_field_title_en_US.ftl b/translations/moderation/src/main/resources/en_US/listener/userUnBanned/userUnBanned_field_title_reason_en_US.ftl
similarity index 100%
rename from translations/moderation/src/main/resources/en_US/commands/ban/ban_log_reason_field_title_en_US.ftl
rename to translations/moderation/src/main/resources/en_US/listener/userUnBanned/userUnBanned_field_title_reason_en_US.ftl