Fix saving config options when creating cluster