diff --git a/DiscordBot/Messages/ExternalUserNameModal.cs b/DiscordBot/Messages/ExternalUserNameModal.cs
index b5d36a7..7a77ee7 100644
--- a/DiscordBot/Messages/ExternalUserNameModal.cs
+++ b/DiscordBot/Messages/ExternalUserNameModal.cs
@@ -11,7 +11,7 @@ namespace DiscordBot.Messages
         public static Modal buildMessage(int raidId, int roleId)
         {
             var mb = new ModalBuilder()
-                .WithTitle("Create Account")
+                .WithTitle("User Name")
                 .WithCustomId($"{Constants.ComponentIds.SIGN_UP_EXTERNAL_MODAL}-{raidId}-{roleId}")
                 .AddTextInput("Name", Constants.ComponentIds.NAME_TEXT_BOX, placeholder: "Name", required: true);
 
diff --git a/DiscordBot/Messages/RaidMessage.cs b/DiscordBot/Messages/RaidMessage.cs
index 06158cd..476c032 100644
--- a/DiscordBot/Messages/RaidMessage.cs
+++ b/DiscordBot/Messages/RaidMessage.cs
@@ -120,7 +120,14 @@ namespace DiscordBot.Messages
             foreach (ApiRaid.Role.User user in role.Users.OrderBy(u => u.Status))
             {
                 string status = !string.IsNullOrWhiteSpace(user.Status) ? $" - {user.Status}" : string.Empty;
-                rolesString += $"\t{user.UserName} ({user.AccountName}) {status}\n";
+                if(string.IsNullOrEmpty(user.AccountName))
+                {
+                    rolesString += $"\t{user.UserName} {status}\n";
+                }
+                else
+                {
+                    rolesString += $"\t{user.UserName} ({user.AccountName}) {status}\n";
+                }
             }
             return rolesString;
         }