Make enrollment module work with registration