diff --git a/mocha-suv/common/libexec/mocha-suv b/mocha-suv/common/libexec/mocha-suv
index 69886a1..4960308 100755
--- a/mocha-suv/common/libexec/mocha-suv
+++ b/mocha-suv/common/libexec/mocha-suv
@@ -75,11 +75,18 @@ elif [ "$1" == "shell" ]; then
 
 		else
 
-			echo "If you are migranting from Vagrant, the password is 'vagrant'"
-			echo "Use 'ssh-copy-id vagrant@$2.privatesuv.com' to set up asymmetric key login"
-			echo ""
+			if [ "$#" == "2" ]; then
+				# only display the banner if we aren't executing a command
+				echo "If you are migranting from Vagrant, the password is 'vagrant'"
+				echo "Use 'ssh-copy-id vagrant@$2.privatesuv.com' to set up asymmetric key login"
+				echo ""
+			fi
 
-			ssh vagrant@$2.privatesuv.com
+			MACHINENAME=$2
+			shift
+			shift
+
+			ssh vagrant@$MACHINENAME.privatesuv.com ${1+"$@"}
 
 		fi