diff --git a/hasql.nixc.us/user-data.sh b/hasql.nixc.us/user-data.sh
index 1342ad7..a4df066 100644
--- a/hasql.nixc.us/user-data.sh
+++ b/hasql.nixc.us/user-data.sh
@@ -25,10 +25,10 @@ apt-get dist-upgrade -y
 apt-get install -y iftop htop glances zsh glusterfs-server glusterfs-client salt-minion
 
 ## Setup ZSH and ohmyzsh theme
-cd /root/
+# cd /root/
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
 #echo y|sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-chsh -s /bin/zsh
+chsh -s $(which zsh)
 sed -i 's/ZSH_THEME="robbyrussell"/ZSH_THEME="pygmalion"/g' /root/.zshrc
 
 ## Install docker-compose and docker using convenience scripts