SSP-2035 - fix how validation regex was being built