diff --git a/src/NadekoBot/Services/Database/Models/FollowedStream.cs b/src/NadekoBot/Services/Database/Models/FollowedStream.cs
index e0784a2b..59c4ad21 100644
--- a/src/NadekoBot/Services/Database/Models/FollowedStream.cs
+++ b/src/NadekoBot/Services/Database/Models/FollowedStream.cs
@@ -13,7 +13,9 @@
         }
 
         public override int GetHashCode() => 
-            ChannelId.GetHashCode() ^ Username.GetHashCode();
+            ChannelId.GetHashCode() ^ 
+            Username.GetHashCode() ^ 
+            Type.GetHashCode();
 
         public override bool Equals(object obj)
         {
@@ -21,7 +23,9 @@
             if (fs == null)
                 return false;
 
-            return fs.ChannelId == ChannelId && fs.Username.ToLowerInvariant().Trim() == Username.ToLowerInvariant().Trim();
+            return fs.ChannelId == ChannelId && 
+                   fs.Username.ToLowerInvariant().Trim() == Username.ToLowerInvariant().Trim() &&
+                   fs.Type == Type;
         }
     }
 }
diff --git a/src/NadekoBot/_Extensions/Extensions.cs b/src/NadekoBot/_Extensions/Extensions.cs
index 0859d080..a1d3498b 100644
--- a/src/NadekoBot/_Extensions/Extensions.cs
+++ b/src/NadekoBot/_Extensions/Extensions.cs
@@ -156,8 +156,8 @@ namespace NadekoBot.Extensions
             return list.ToArray();
         }
 
-        public static Task<IUserMessage> EmbedAsync(this IMessageChannel ch, Discord.API.Embed embed)
-             => ch.SendMessageAsync("", embed: embed);
+        public static Task<IUserMessage> EmbedAsync(this IMessageChannel ch, Discord.API.Embed embed, string msg = "")
+             => ch.SendMessageAsync(msg, embed: embed);
 
         public static Task<IUserMessage> SendErrorAsync(this IMessageChannel ch, string error, string title = null, string url = null)
              => ch.SendMessageAsync("", embed: new Embed() { Description = error, Title = title, Url = url, Color = NadekoBot.ErrorColor });