Event tracking for enrollment
Bugfix for enroll button, removed dead code