Feature/club 682

Updated the validation on form inputs to meet the latest requirements.
We should remove commented code.