I'm sure I'll figure out a way around this, and its not super crucial at the moment, just a tad annoying.
UPDATE: A colleague suggested a very simple fix for this, simply putting a comma at the end of "Geological Survey of Queensland", and leaving a blank space for the 'first name'. Works like a charm :D