diff --git a/vm-setup.sh b/vm-setup.sh
index 7df9dee..d5a5abf 100644
--- a/vm-setup.sh
+++ b/vm-setup.sh
@@ -4,12 +4,12 @@
 # This script installs ONOS dependencies and installs a desktop environment on a Miniet VM.
 
 
-USER=tutorial1
-USER_HOME=/home/${USER}
+export CURRENT_USER=tutorial1
+export USER_HOME=/home/${CURRENT_USER}
 
-sudo /usr/sbin/useradd -c "Basic ONOS Tutorial" -d /home/${USER} -U -m -p $(openssl passwd -1 ${USER}) -s /bin/bash ${USER}
+sudo /usr/sbin/useradd -c "Basic ONOS Tutorial" -d /home/${CURRENT_USER} -U -m -p $(openssl passwd -1 ${CURRENT_USER}) -s /bin/bash ${CURRENT_USER}
 
-sudo echo "${USER} ALL=NOPASSWD: ALL" >> /etc/sudoers
+sudo echo "${CURRENT_USER} ALL=NOPASSWD: ALL" >> /etc/sudoers
 
 sudo apt-get update
 
@@ -23,7 +23,7 @@
 
 # -------------- Switch User ------------------
 
-sudo su - ${USER}
+sudo su - ${CURRENT_USER}
 
 # -------------- Setup keys -------------------