Simplify password policy handler logic per code review.