diff --git a/vm-setup.sh b/vm-setup.sh
index 22d79e1..0494f0c 100644
--- a/vm-setup.sh
+++ b/vm-setup.sh
@@ -25,9 +25,6 @@
 # ------------- DHCP demo Install ------------
 
 git clone https://bitbucket.org/lantz/cs144-dhcp.git
-cd cs144-dhcp
-sudo python -c "import dhcp; dhcp.checkRequired()"
-cd ~
 
 # -------------- Offline content -------------
 sudo apt-get install -y python-pip
@@ -42,6 +39,11 @@
 # -------------- Setup Desktop ----------------
 sudo apt-get install -y xorg lxde
 
+# DHCP dependencies
+cd cs144-dhcp
+sudo python -c "import dhcp; dhcp.checkRequired()"
+cd ~
+
 #TODO: add backgrounds folder
 sudo mkdir /usr/share/backgrounds
 #TODO: change background
@@ -53,8 +55,9 @@
 echo '[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx' >> ~/.bashrc
 
 # Automatically log into the VM
-sudo sed -i 's/exec /sbin/getty -8 38400 tty1//g' /etc/init/tty1.conf
-echo 'exec /bin/login -f bob < /dev/tty1 > /dev/tty1 2>&1' | sudo tee -a /etc/init/tty1.conf
+#sudo sed -i 's/exec /sbin/getty -8 38400 tty1//g' /etc/init/tty1.conf
+#sudo sed -i '$ d' /etc/init/tty1.conf
+#echo 'exec /bin/login -f bob < /dev/tty1 > /dev/tty1 2>&1' | sudo tee -a /etc/init/tty1.conf
 
 # Disable screensaver
 sudo sed -i '/screensaver/d' /etc/xdg/lxsession/LXDE/autostart