Temporary fix for auto-enroll