You can fire one of your companions, and have the other player recruit them (either at the inn or the Hall of Heroes in the Homestead), then they'll follow your partner's character.
Yes, it will be fixed so you don't have to do that - for the dialogue issue as well.