My advice would be to stand your ground on these matters. If you are a walkover IMO will walk all over you. Had you refused to move and showed them both passports with DTV physical certificate and enough push back I am sure they would have changed it.