Location form renders badly when using only a single location

See screenshot - when using a single location, the UI shows two group boxes, both with the name 'Location' in them. I'm using this on my sign up form so it looks kind of messy to the new user, and looks a bit weird as well when you go to edit a location. It should just show one groupbox here ideally, possibly even with a configurable label.