NPC quest issue

[JaRy66]

Title: NPC quest issue (Vaelen the flayed

Issue: To explain shortly, in icecrown, as you do the quests to retake shadow Vault, you are sent to north Jotunheim, where in cave you find chained Vaelen the flayed, and he gives you series of quests, that can free him, and return him to the Shadow Vault.
However there are total 3 quests the NPC offers, 2 in his chained form, and one in his Shadow Vault form. BUT currently his chained form is offering all 3 quests, making it weird from the quest description side.

The npc's
https://www.wowhead.com/wotlk/npc=30056/vaelen-the-flayed (chained)
https://www.wowhead.com/wotlk/npc=30218/vaelen-the-flayed (shadow vault)

There even is quest referencing him coming back to the vault:
https://www.wowhead.com/wotlk/quest=13085/vaelen-has-returned

TL:DR*
The chained version of the NPC is giving player a quest, that the "free" version of NPC should give away

Proof:

[JaRy66]

Update: The chained version also help the player fight, he shouldn't do that. He's chained

[YggdrasilWotLK]

@Lortz92 wanna change which NPCs the quests are connected to?