Logon fix, for username case