fixing user mgmt