There's a current idea (likely to implement) auto-enrollment "x" days after hire. Can the additional be added to auto-enroll "x" days after last completion.
