diff --git a/Modules/Inviter.lua b/Modules/Inviter.lua
index e0e59d4..bff2780 100644
--- a/Modules/Inviter.lua
+++ b/Modules/Inviter.lua
@@ -183,12 +183,25 @@ function shared.Inviter.Init()
 		if not Heimdall_Data.config.inviter.enabled then return end
 		local channelId = select(6, ...)
 		local _, channelname = GetChannelName(channelId)
-		if channelname ~= Heimdall_Data.config.inviter.listeningChannel then return end
+		if Heimdall_Data.config.inviter.debug then
+			print(string.format("[%s] Channel name: %s", ModuleName, channelname))
+		end
+
+		if channelname ~= Heimdall_Data.config.inviter.listeningChannel then
+			if Heimdall_Data.config.inviter.debug then
+				print(string.format("[%s] Channel name does not match listening channel", ModuleName))
+			end
+			return
+		end
 		if msg == Heimdall_Data.config.inviter.keyword then
 			if Heimdall_Data.config.inviter.debug then
 				print(string.format("[%s] Inviting %s", ModuleName, sender))
 			end
 			InviteUnit(sender)
+		else
+			if Heimdall_Data.config.inviter.debug then
+				print(string.format("[%s] Message does not match keyword", ModuleName))
+			end
 		end
 	end)
 
@@ -198,24 +211,6 @@ function shared.Inviter.Init()
 			tostring(Heimdall_Data.config.inviter.allAssist),
 			tostring(Heimdall_Data.config.inviter.agentsAssist)))
 	end
-	print("[Heimdall] Inviter loaded")
-	einviterChannelFrame:RegisterEvent("CHAT_MSG_CHANNEL")
-	inviterChannelFrame:SetScript("OnEvent", function(self, event, msg, sender, ...)
-		--		if Heimdall_Data.config.inviter.debug then
-		--			print(string.format("[%s] Chat message received: %s", ModuleName, msg))
-		--			shared.dumpTable(Heimdall_Data.config.inviter)
-		--		end
-		if not Heimdall_Data.config.inviter.enabled then return end
-		local channelId = select(6, ...)
-		local _, channelname = GetChannelName(channelId)
-		if channelname ~= Heimdall_Data.config.inviter.listeningChannel then return end
-		if msg == Heimdall_Data.config.inviter.keyword then
-			if Heimdall_Data.config.inviter.debug then
-				print(string.format("[%s] Inviting %s", ModuleName, sender))
-			end
-			InviteUnit(sender)
-		end
-	end)
 
 	if Heimdall_Data.config.inviter.debug then
 		print(string.format("[%s] Module initialized - All assist: %s, Agents assist: %s",