HR-196, HR-222: fix issues with activating/enrolling