Updates to support the user management interface in the UI