diff --git a/setup/bindir/cloud-set-guest-password.in b/setup/bindir/cloud-set-guest-password.in
index 97e6e3d7bee..69be175ceff 100755
--- a/setup/bindir/cloud-set-guest-password.in
+++ b/setup/bindir/cloud-set-guest-password.in
@@ -39,7 +39,7 @@ do
 		file_count=$((file_count+1))
 		PASSWORD_SERVER_IP=$(grep dhcp-server-identifier $DHCP_FILE | tail -1 | awk '{print $NF}' | tr -d '\;')
 
-		if [ -n $PASSWORD_SERVER_IP ]
+		if [ -n "$PASSWORD_SERVER_IP" ]
 		then
 			logger -t "cloud" "Found password server IP $PASSWORD_SERVER_IP in $DHCP_FILE"
 			logger -t "cloud" "Sending request to password server at $PASSWORD_SERVER_IP"
diff --git a/setup/bindir/cloud-set-guest-sshkey.in b/setup/bindir/cloud-set-guest-sshkey.in
index 69124dca4c1..15008b8d514 100755
--- a/setup/bindir/cloud-set-guest-sshkey.in
+++ b/setup/bindir/cloud-set-guest-sshkey.in
@@ -40,7 +40,7 @@ do
 		file_count=$((file_count+1))
 		SSHKEY_SERVER_IP=$(grep dhcp-server-identifier $DHCP_FILE | tail -1 | awk '{print $NF}' | tr -d '\;')
 
-		if [ -n $SSHKEY_SERVER_IP ]
+		if [ -n "$SSHKEY_SERVER_IP" ]
 		then
 			logger -t "cloud" "Sending request to ssh key server at $SSHKEY_SERVER_IP"