added check for Login and Password fields