diff --git a/config/templates/config-vagrant.conf b/config/templates/config-vagrant.conf
index 1e0cd21d5..7303d17ec 100644
--- a/config/templates/config-vagrant.conf
+++ b/config/templates/config-vagrant.conf
@@ -2,12 +2,13 @@
 #
 # This is a Vagrant launcher file. To set up the configuration, use command line arguments to compile.sh
 
-# remove "vagrant" from the command line
-shift
+# While we are in config-vagrant.conf, we no longer need "vagrant" option
+# So if "vagrant" wasn't removed from the command line by caller, we do it now
+[[ "$1" == "vagrant" ]] && shift
 
 # second argument can be a build parameter or a config file
 unset VAGRANT_CONF
-[[ $1 != *=* ]] && VAGRANT_CONF=$1
+[[ $1 != *=* ]] && VAGRANT_CONF=$1 && shift
 
 display_alert "Building and running the Vagrant box"
 VAGRANT_INSTALL_LOCAL_PLUGINS=1 vagrant up || vagrant up