Cannot confirm if #3 was valid, but with these changes & my testing (alt f4 wow and relogin) it worked as intended.

Maybe i'm like blizzard GM's? http://www.wowwiki.com/Working_as_intended

Closes #3