Client form, Profile page; Salutation and Addressee dropdowns not populated for Organisations

On the Client form, Profile page, the Salutation and Addressee dropdowns were not populated for Organisations.

Note, this could mean the previous Client's details are shown in the dropdown (if they were an Individual).