Design updates to user mgmt