diff --git a/src/NadekoBot/Modules/CustomReactions/Extensions.cs b/src/NadekoBot/Modules/CustomReactions/Extensions.cs
index ba6d2131..147d6dcf 100644
--- a/src/NadekoBot/Modules/CustomReactions/Extensions.cs
+++ b/src/NadekoBot/Modules/CustomReactions/Extensions.cs
@@ -14,7 +14,7 @@ namespace NadekoBot.Modules.CustomReactions
     {
         public static Dictionary<string, Func<IUserMessage, string>> placeholders = new Dictionary<string, Func<IUserMessage, string>>()
         {
-            {"%mention%", (ctx) => { return $"<@!{NadekoBot.Client.GetCurrentUser().Id}>"; } },
+            {"%mention%", (ctx) => { return $"<@{NadekoBot.Client.GetCurrentUser().Id}>"; } },
             {"%user%", (ctx) => { return ctx.Author.Mention; } },
             {"%target%", (ctx) => { return ctx.MentionedUsers.Shuffle().FirstOrDefault()?.Mention ?? "Nobody"; } },
             {"%rng%", (ctx) => { return new NadekoRandom().Next(0,10).ToString(); } }
diff --git a/src/NadekoBot/Modules/Help/Help.cs b/src/NadekoBot/Modules/Help/Help.cs
index 91a507aa..2084f19b 100644
--- a/src/NadekoBot/Modules/Help/Help.cs
+++ b/src/NadekoBot/Modules/Help/Help.cs
@@ -36,15 +36,6 @@ namespace NadekoBot.Modules.Help
 
         public Help(ILocalization loc, CommandService cmds, ShardedDiscordClient client) : base(loc, cmds, client)
         {
-            client.MessageReceived += async (msg) =>
-            {
-                if (msg.Author.IsBot)
-                    return;
-                if (msg.Channel is IPrivateChannel)
-                {
-                    await msg.Channel.SendMessageAsync(DMHelpString).ConfigureAwait(false);
-                }
-            };
         }
 
         [NadekoCommand, Usage, Description, Aliases]
diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs
index 15c7c752..da9cbe68 100644
--- a/src/NadekoBot/Services/CommandHandler.cs
+++ b/src/NadekoBot/Services/CommandHandler.cs
@@ -16,6 +16,7 @@ using Discord.Net;
 using NadekoBot.Extensions;
 using static NadekoBot.Modules.Permissions.Permissions;
 using System.Collections.Concurrent;
+using NadekoBot.Modules.Help;
 
 namespace NadekoBot.Services
 {
@@ -160,6 +161,13 @@ namespace NadekoBot.Services
                                     await msg.Channel.SendMessageAsync(":warning: " + result.ErrorReason).ConfigureAwait(false);
                             }
                         }
+                        else
+                        {
+                            if (msg.Channel is IPrivateChannel)
+                            {
+                                await msg.Channel.SendMessageAsync(Help.DMHelpString).ConfigureAwait(false);
+                            }
+                        }
                     }
                     catch (Exception ex)
                     {