fixed logon issue
fixing merge