[USERSRV] Hard-error improvements 7/7