Fix username & password logic