diff --git a/salt/common/tools/sbin/so-minion b/salt/common/tools/sbin/so-minion
index 3bfd626ad..8ef986390 100755
--- a/salt/common/tools/sbin/so-minion
+++ b/salt/common/tools/sbin/so-minion
@@ -209,10 +209,12 @@ function createIDHNODE() {
 }
 
 function testConnection() {
-	salt "$MINION_ID" test.ping
+	retry 5 10 "salt '$MINION_ID' test.ping" 0
 	local ret=$?
 	if [[ $ret != 0 ]]; then
 		echo "The Minion has been accepted but is not online. Try again later"
+		echo "Deleting the key"
+		deleteminion
 		exit 1
 	fi
 }
diff --git a/setup/so-functions b/setup/so-functions
index 7bba91092..20340436e 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1810,7 +1810,7 @@ drop_install_options() {
 	# Drop the install Variable
 	echo "MAINIP=$MAINIP" > /opt/so/install.txt
 	echo "MNIC=$MNIC" >> /opt/so/install.txt
-	echo "NODE_DESCRIPTION=$NODE_DESCRIPTION" >> /opt/so/install.txt
+	echo "NODE_DESCRIPTION='$NODE_DESCRIPTION'" >> /opt/so/install.txt
 	echo "ES_HEAP_SIZE=$ES_HEAP_SIZE" >> /opt/so/install.txt
 	echo "PATCHSCHEDULENAME=$PATCHSCHEDULENAME" >> /opt/so/install.txt
 	echo "INTERFACE=$INTERFACE" >> /opt/so/install.txt