Fixed more validation problems-enrollment is working correctly