diff --git a/tools/package/bin/onos-form-cluster b/tools/package/bin/onos-form-cluster
index 925c6ff..7a0abda 100755
--- a/tools/package/bin/onos-form-cluster
+++ b/tools/package/bin/onos-form-cluster
@@ -5,6 +5,18 @@
 
 [ $# -lt 2 ] && echo "usage: $(basename $0) ip1 ip2..." && exit 1
 
+# 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
+user=${user:-onos}           # user defaults to 'onos'
+password=${password:-$user}  # password defaults to user name if not specified
+let OPC=$OPTIND-1
+shift $OPC
+
 ip=$1
 shift
 nodes=$*
@@ -22,5 +34,6 @@
 
 for node in $ip $nodes; do
     echo "Forming cluster on $node..."
-    curl -X POST http://$node:8181/onos/v1/cluster/configuration -d @$aux
+    curl --user $user:$password -X POST \
+        http://$node:8181/onos/v1/cluster/configuration -d @$aux
 done
\ No newline at end of file
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