diff --git a/Channeler.lua b/Channeler.lua
index 9ef1b02..54ebd6c 100644
--- a/Channeler.lua
+++ b/Channeler.lua
@@ -105,12 +105,16 @@ local function FindOrCreateChatFrame(chatFrameName, groups, channels)
 	return chatFrame
 end
 
-local frame = CreateFrame("Frame")
---frame:RegisterEvent("PLAYER_LOGIN")
-frame:RegisterEvent("PLAYER_ENTERING_WORLD")
-frame:SetScript("OnEvent", function(self, event, ...)
+local function Configure()
 	JoinChannels()
 	FindOrCreateChatFrame("Auto", subscribedMessageGroups, subscribedChannels)
 	--	FindOrCreateChatFrame("Agent", {}, { "Agent" })
 	--	FindOrCreateChatFrame("Horde", {}, { "Horde" })
+end
+
+local frame = CreateFrame("Frame")
+frame:RegisterEvent("PLAYER_LOGIN")
+frame:RegisterEvent("PLAYER_ENTERING_WORLD")
+frame:SetScript("OnEvent", function(self, event, ...)
+	Configure()
 end)