diff --git a/salt/manager/tools/sbin/so-kafka-clusterid b/salt/manager/tools/sbin/so-kafka-clusterid
index 719973247..fcbe3ba42 100644
--- a/salt/manager/tools/sbin/so-kafka-clusterid
+++ b/salt/manager/tools/sbin/so-kafka-clusterid
@@ -16,7 +16,9 @@ fi
 if ! grep -q "^  kafka_cluster_id:" $local_salt_dir/pillar/secrets.sls; then
     kafka_cluster_id=$(get_random_value 22)
     echo '  kafka_cluster_id: '$kafka_cluster_id >> $local_salt_dir/pillar/secrets.sls
-else
-    echo 'kafka_cluster_id exists'
-    salt-call pillar.get secrets
+fi
+
+if ! grep -q "^  kafkapass:" $local_salt_dir/pillar/secrets.sls; then
+    kafkapass=$(get_random_value)
+    echo '  kafkapass: '$kafkapass >> $local_salt_dir/pillar/secrets.sls
 fi
\ No newline at end of file
diff --git a/setup/so-functions b/setup/so-functions
index a669c52fc..176349edb 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1116,6 +1116,7 @@ generate_passwords(){
   SOCSRVKEY=$(get_random_value 64)
   IMPORTPASS=$(get_random_value)
   KAFKACLUSTERID=$(get_random_value 22)
+  KAFKAPASS=$(get_random_value)
 }
 
 generate_interface_vars() {
@@ -1947,7 +1948,8 @@ secrets_pillar(){
 		"secrets:"\
 		"  import_pass: $IMPORTPASS"\
 		"  influx_pass: $INFLUXPASS"\
-		"  kafka_cluster_id: $KAFKACLUSTERID" > $local_salt_dir/pillar/secrets.sls
+		"  kafka_cluster_id: $KAFKACLUSTERID"\
+		"  kafka_pass: $KAFKAPASS" > $local_salt_dir/pillar/secrets.sls
   fi
 }