Add password encryption and clean up form error messages