Fixed Issues with Logon logic that was putting us in a loop
Fixed login logic