Are you sure? One of the things they fixed in the patch was the portrait of the characters switching, and after leaving the citadel the two of them have switched.