Minor changes to user mgmt.