Fix register_and_enroll