Added check for Login and Password fields