diff --git a/piratebox/piratebox/bin/generate_config_files.sh b/piratebox/piratebox/bin/generate_config_files.sh
index 64dc67a..e87486a 100755
--- a/piratebox/piratebox/bin/generate_config_files.sh
+++ b/piratebox/piratebox/bin/generate_config_files.sh
@@ -190,9 +190,10 @@ generate_dnsmasq  $NET $IP_SHORT  $START_LEASE  $END_LEASE $LEASE_DURATION $DNSM
 generate_lighttpd_env $GLOBAL_CHAT "$GLOBAL_DEST" $PIRATEBOX_PYTHONPATH $GEN_CHATFILE $PIRATEBOX_FOLDER  $CHATFILE
 
 if [ "$NODE_CONFIG_ACTIVE" = "yes" ] ; then
-     echo "Appending local node-name hosts entry"
+     echo -n "Appending local node-name hosts entry"
      if generate_node_name "$HOST" "$NODE_NAME" "$NODE_GEN" ; then
-	echo $NODE_GEN_OUTPUT   $NODE_IPV6_IP" >> "$HOSTS_CONFIG 
+	echo $NODE_GEN_OUTPUT
+	echo "$NODE_IPV6_IP   $NODE_GEN_OUTPUT  " >> $HOSTS_CONFIG
      else 
 	 echo "Error: No valid node-name-config found, skipping"
      fi
diff --git a/piratebox/piratebox/lib/node_name_generation.sh b/piratebox/piratebox/lib/node_name_generation.sh
index 95b9c09..a8050f3 100644
--- a/piratebox/piratebox/lib/node_name_generation.sh
+++ b/piratebox/piratebox/lib/node_name_generation.sh
@@ -16,14 +16,14 @@ generate_node_name() {
 
 	local complete_node_name=$in_node_name"."$in_host
 
-	if [ "$in_node_gen" = "no" ] : then
+	if [ "$in_node_gen" = "no" ] ; then
         	complete_node_name=$in_node_name
 	fi
      	if [ "$in_node_name" = "" ] ;  then
 		complete_node_name=$in_host
 	fi
 	if [ "$complete_node_name" != "" ] ; then
-		export NODE_GEN_OUTPUT=$output_name
+		export NODE_GEN_OUTPUT=$complete_node_name
 		return 0
 	else
         	echo "Error: No valid node-name found"