Fixed original Logout issue. Still seems like a "hack" though