Temporary auto-enroll fix