diff --git a/src/handlers/modal-submit.ts b/src/handlers/modal-submit.ts
index de24eba..55a64fc 100644
--- a/src/handlers/modal-submit.ts
+++ b/src/handlers/modal-submit.ts
@@ -48,8 +48,9 @@ export default async function (
 					},
 				],
 				username:
-					interaction.member?.nick ??
-					`${interaction.member?.user.username}#${interaction.member.user.discriminator}`,
+					interaction.member?.nick ?? interaction.member?.user.discriminator === "0"
+						? `${interaction.member.user.username}#${interaction.member.user.discriminator}`
+						: interaction.member.user.username,
 				avatar_url: GetMemberAvatar(interaction.member, interaction.guild_id),
 			} as RESTPostAPIWebhookWithTokenJSONBody),
 		});