Somehow, I don't think the folks at LA would let Obsidian do a trick that obvious again.
I think it's more likely when you get on Onderon you have a choice between aiding The Queen (Atris?) or the Sith seperatists.
If you aid the Sith, you get Visas Marr. If you aid the Queen she sends one of her handmaidens to assist you.
After you kick Jedi/Sith tail, your party member asks the Queen/Sith Lord if she can join your crusade and bam! One of your NPC slots is now filled.
<{POST_SNAPBACK}>
One side, i find it interesting having her as the Queen of Onderon, it really puts this game into a whole new perspective. But one can now discard her as the potential love-interest, meh.