"final" fix of logon/logoff