Fix the organisation selection bug when adding new hsms...