PLAT-6398 - Integrate user management with components

Fixup based on PR comments