Fix: handle private tokens in remote format too.