While we are changing things, maybe we should rather conditionally set the authority from null to "".