diff --git a/tools/package/bin/onos-secure-ssh b/tools/package/bin/onos-secure-ssh
index ac94de5..3f541db 100755
--- a/tools/package/bin/onos-secure-ssh
+++ b/tools/package/bin/onos-secure-ssh
@@ -7,14 +7,14 @@
 
 set -e
 
-# Scan argument for user/password or other options...
+# Scan arguments for user/password or other options...
 while getopts u:p: o; do
     case "$o" in
         u) user=$OPTARG;;
         p) password=$OPTARG;;
     esac
 done
-password=${password:-user} # password defaults to the user name if not specified
+password=${password:-$user} # password defaults to the user if not specified
 let OPC=$OPTIND-1
 shift $OPC