diff --git a/sshtool b/sshtool
index 5ac50cb..ffe1e4e 100755
--- a/sshtool
+++ b/sshtool
@@ -28,10 +28,10 @@ SSH_CONFIG=cluster/$CLUSTER/ssh_config
 
 function header {
 	cat <<EOF
-export DEPLOYTOOL_ROOT_PASSWORD=$ROOT_PASS
+export DEPLOYTOOL_ROOT_PASSWORD="$ROOT_PASS"
 cat > /tmp/deploytool_askpass <<EOG
 #!/usr/bin/env sh
-echo \$DEPLOYTOOL_ROOT_PASSWORD
+echo "\$DEPLOYTOOL_ROOT_PASSWORD"
 EOG
 chmod +x /tmp/deploytool_askpass
 export SUDO_ASKPASS=/tmp/deploytool_askpass