fix form and validation
IN PROGRESS - issue AFP-96: Add licensing check on ocm-tools 
https://openafp.atlassian.net/browse/AFP-96