diff --git a/bin/ssh b/bin/ssh
index 2ee4207..1617700 100755
--- a/bin/ssh
+++ b/bin/ssh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-userAtAddress="$1"
+userAtAddress="$1"; shift
 USER=$(echo "$userAtAddress" | cut -d"@" -f1);
 HOST=$(echo "$userAtAddress" | cut -d"@" -f2);
 
@@ -9,7 +9,7 @@ then
   printf "Enter your username: "
   read -r USER
   USER=$(echo "${USER}" | tr -d '[:space:]')
-  ssh "$USER"@"$HOST"
+  ssh "$USER"@"$HOST" ${@}
 else
-  ssh "$userAtAddress"
+  ssh "$userAtAddress" ${@}
 fi
diff --git a/cli.mjs b/cli.mjs
index 2f14363..7ec34f1 100644
--- a/cli.mjs
+++ b/cli.mjs
@@ -50,7 +50,7 @@ if (opts.help) {
 const sshuser = opts.sshuser || process.env.SSHUSER || '';
 const sshhost = opts.sshhost || process.env.SSHHOST || 'localhost';
 const sshauth = opts.sshauth || process.env.SSHAUTH || 'password,keyboard-interactive';
-const sshport = opts.sshport || process.env.SSHPOST || 22;
+const sshport = opts.sshport || process.env.SSHPORT || 22;
 const port = opts.port || process.env.PORT || 3000;
 
 loadSSL(opts)