I believe the AN7 has a thermal probe under the north bridge.
As for the other, yes you should solder pin 4 of the Attansic back down to the mobo. You don't need to move the jumper though. It's already in the right place. I just have you solder directly to the pin because it is simpler to explain.
