Yes, you are correct. You should manually enter the disallowed loss as cost basis on the subsequent shares sold and not as basis on the wash sale shares. Though the brokerage didn't make the adjustment, the taxpayer is responsible to report income correctly.
@josephbenedict
