Added password checking