[USERSRV] Hard-error improvements 3/7