reordered options for validate_password to be inline with other subs