SBSD to Sort V1 / Minor changes to user mgmt