diff --git a/salt/kafka/nodes.map.jinja b/salt/kafka/nodes.map.jinja
index 5d74e9e1c..36f789259 100644
--- a/salt/kafka/nodes.map.jinja
+++ b/salt/kafka/nodes.map.jinja
@@ -1,5 +1,5 @@
 {% set current_kafkanodes = salt.saltutil.runner('mine.get', tgt='G@role:so-manager or G@role:so-managersearch or G@role:so-standalone or G@role:so-receiver', fun='network.ip_addrs', tgt_type='compound') %}
-{% set STORED_KAFKANODES = salt['pillar.get']('kafka:nodes', {}) %}
+{% set STORED_KAFKANODES = salt['pillar.get']('kafka', {}) %}
 
 {% set existing_ids = [] %}
 
diff --git a/salt/manager/tools/sbin/so-kafka-clusterid b/salt/manager/tools/sbin/so-kafka-clusterid
index 7ac055997..829e4fc87 100644
--- a/salt/manager/tools/sbin/so-kafka-clusterid
+++ b/salt/manager/tools/sbin/so-kafka-clusterid
@@ -20,10 +20,10 @@ fi
 
 if ! grep -q "^  cluster_id:" $local_salt_dir/pillar/kafka/soc_kafka.sls; then
     kafka_cluster_id=$(get_random_value 22)
-    echo 'kafka: ' > $local_salt_dir/pillar/kafka/soc_kafka.sls
     echo '  cluster_id: '$kafka_cluster_id >> $local_salt_dir/pillar/kafka/soc_kafka.sls
+fi
 
 if ! grep -q "^  kafkapass:" $local_salt_dir/pillar/kafka/soc_kafka.sls; then
     kafkapass=$(get_random_value)
     echo '  kafkapass: '$kafkapass >> $local_salt_dir/pillar/kafka/soc_kafka.sls
-fi
+fi
\ No newline at end of file