fixed logon handling