diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Core.lua b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Core.lua
index 52a6287e9..e55127106 100644
--- a/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Core.lua	
+++ b/Artemis/Artemis/Modules/Games/WoW/Resources/Addon source/Core.lua	
@@ -1,9 +1,6 @@
 Artemis = LibStub("AceAddon-3.0"):NewAddon("Artemis", "AceConsole-3.0", "AceEvent-3.0", "AceTimer-3.0", "AceComm-3.0")
 json = LibStub("json")
 
--- Hook onto logout because it seems PLAYER_LOGOUT fires on reload as well
-local _Logout = Logout
-
 local debugging = false
 local lastLine = {}
 local channeling = {}
@@ -22,6 +19,7 @@ function Artemis:OnEnable()
     Artemis:RegisterEvent("PLAYER_ENTERING_WORLD")
     Artemis:RegisterEvent("PLAYER_LEVEL_UP")
     Artemis:RegisterEvent("PLAYER_FLAGS_CHANGED")
+    Artemis:RegisterEvent("PLAYER_LOGOUT")
     Artemis:RegisterEvent("ACHIEVEMENT_EARNED")
     Artemis:RegisterEvent("ACTIVE_TALENT_GROUP_CHANGED")
     Artemis:RegisterEvent("UNIT_TARGET")
@@ -174,11 +172,6 @@ function Artemis:PLAYER_ENTERING_WORLD(...)
     Artemis:TransmitUnitState("player", true);
 end
 
-function Logout()
-    Artemis:Transmit("gameState", "loggedOut")
-    return _Logout()
-end
-
 function Artemis:PLAYER_LEVEL_UP(...)
     Artemis:Transmit("player", Artemis:GetPlayerDetails())
 end
@@ -199,6 +192,10 @@ function Artemis:PLAYER_FLAGS_CHANGED(...)
     end
 end
 
+function Artemis:PLAYER_LOGOUT(...)
+    Artemis:Transmit("gameState", "loggedOut")
+end
+
 function Artemis:ACHIEVEMENT_EARNED(...)
     Artemis:Transmit("player", Artemis:GetPlayerDetails())
 end
diff --git a/Artemis/Artemis/Modules/Games/WoW/Resources/wow-addon.zip b/Artemis/Artemis/Modules/Games/WoW/Resources/wow-addon.zip
index 70d820a9a..75dec926a 100644
Binary files a/Artemis/Artemis/Modules/Games/WoW/Resources/wow-addon.zip and b/Artemis/Artemis/Modules/Games/WoW/Resources/wow-addon.zip differ