XC-159 - registration validation fixes