Minor change to how the default hostname is set, to allow for blank hostnames to be used