Couple of fix, fixed the login errors