Mapping Component works for Leads but not Companies

We are on 7.3a, I've installed the Mapping Tool and altered the MapsTab.asp to include the postcode on both lead and company tabs, but I still cant get the Company Map Tab to work correctly. When I click the tab the search box is empty, when I then click Change Location, the address that appears is the first address I searched for from the Lead map tab, if I change this and put an address in, it saves the pin, if I then select another Company to Map it shows the Map from the previous Company, if I then click Change Location to enter a new address it shows the address from the first Lead again.

The Lead map tab is working perfectly, displaying Leads in the correct place.