work around onLogout logic (bug 836860, 838812)