Changed Registation enabled behavior and fixed class required editing