cleanup user mgt related JSON-schema and improve UX