* Logon refactoring