Make salt defaulting work for keysalts