Good to hear. But until then you can get around this problem by doing this:
Open your character's Traits window. Switch to trait tab 2 if you are on 1, or 1 if you are on 2. Confirm the switch. Now talk to Tom and you can slot your warrior and confirm it. Then switch your character's trait tab back to what it was.