diff --git a/.zshenv b/.zshenv
index f24a7fc..edfcc5a 100644
--- a/.zshenv
+++ b/.zshenv
@@ -3,5 +3,5 @@
 # Where to look for zsh config
 ZDOTDIR=~/.zsh
 
-# Load config files in $ZSH/lib that for stage 3
+# Load config files in $ZSH/lib that for stage 1
 for config_file ($ZDOTDIR/lib/10-*.zsh) source $config_file
diff --git a/init/mac.sh b/init/mac.sh
index 35e0c1c..1af9605 100755
--- a/init/mac.sh
+++ b/init/mac.sh
@@ -185,7 +185,6 @@ echo ">>> Processing Brewfile..."
 # Install apps from Brewfile
 brew bundle
 
-
 echo ">>> Instaling apps that are not avaliable in brew or AppStore..."
 MAC_INSTALLMOUNT="$MAC_DOWNLOAD/mount"
 mkdir -p ${MAC_INSTALLMOUNT}
@@ -238,3 +237,7 @@ done
 find $MAC_NATIVEFIERTMP -depth 2 -name "*.app" -exec cp -rf {} /Applications \;
 
 rm -rf $MAC_NATIVEFIERTMP
+
+## Set zsh from brew as default shell
+echo ">>> Setting /usr/local/bin/zsh as default shell for $USER"
+sudo chsh -s /usr/local/bin/zsh $USER