Fix for adding new validation in the frontend and the backend code

Reviewer: Cy Casada

Issue: GCP-9621