[USERSRV] Hard-error improvements 6/7