added check for Login and Password