EUCA-7876
now perform additional validation check on submit