Added password check to Manager