CMS user mgmt fixes