Review: Change how UI's enrollment is managed