fix validation error when clicking finish (GCP-8521)