Added pw validations back in