Fix Enrollment

Enrollment fix

Fix Enrollment issues

Privacy Settings