Added password check