diff --git a/flavours/user.flavour/install.sh b/flavours/user.flavour/install.sh
index 9000c62..6012312 100755
--- a/flavours/user.flavour/install.sh
+++ b/flavours/user.flavour/install.sh
@@ -24,5 +24,14 @@ else
         fi
     fi
 
+    echo -n "   Set up zsh with ohmyzsh for $name? (Y/n) "
+    read answer
+    if [ "$answer" == "y" ] || [ "$answer" == "Y" ]; then
+        pacstrap /mnt zsh
+        pacman -Sy --noconfirm git
+        git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git /mnt/home/$name/
+        wget https://git.darknebu.la/maride/config/raw/master/zshrc -O /mnt/home/$name/.zshrc
+    fi
+
 	amf_return=0
 fi
diff --git a/flavours/zsh.flavour/install.sh b/flavours/zsh.flavour/install.sh
deleted file mode 100755
index 44fc804..0000000
--- a/flavours/zsh.flavour/install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-echo "~> Installing zsh with ohmyz.sh mod"
-
-pacstrap /mnt zsh
-pacman -S --noconfirm git
-git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git /mnt/home/*/
-wget https://git.darknebu.la/maride/config/raw/master/zshrc -O /mnt/home/*/.zshrc