diff --git a/DiscordChatExporter.Core.Models/User.cs b/DiscordChatExporter.Core.Models/User.cs
index 2114aac..dc116f7 100644
--- a/DiscordChatExporter.Core.Models/User.cs
+++ b/DiscordChatExporter.Core.Models/User.cs
@@ -2,7 +2,7 @@
 
 namespace DiscordChatExporter.Core.Models
 {
-    // https://discordapp.com/developers/docs/topics/permissions#role-object
+    // https://discordapp.com/developers/docs/resources/user#user-object
 
     public partial class User : IHasId
     {
diff --git a/DiscordChatExporter.Core.Rendering/Logic/HtmlRenderingLogic.cs b/DiscordChatExporter.Core.Rendering/Logic/HtmlRenderingLogic.cs
index 4e7bfef..23f9096 100644
--- a/DiscordChatExporter.Core.Rendering/Logic/HtmlRenderingLogic.cs
+++ b/DiscordChatExporter.Core.Rendering/Logic/HtmlRenderingLogic.cs
@@ -15,7 +15,11 @@ namespace DiscordChatExporter.Core.Rendering.Logic
     {
         public static bool CanBeGrouped(Message message1, Message message2)
         {
-            if (message1.Author.Id != message2.Author.Id)
+            if (!string.Equals(message1.Author.Id, message2.Author.Id, StringComparison.Ordinal))
+                return false;
+
+            // Bots can post message under different usernames, so need to check this too
+            if (!string.Equals(message1.Author.FullName, message2.Author.FullName, StringComparison.Ordinal))
                 return false;
 
             if ((message2.Timestamp - message1.Timestamp).Duration().TotalMinutes > 7)