diff --git a/src/add_users.py b/src/add_users.py
index b8dff2e..57028c9 100644
--- a/src/add_users.py
+++ b/src/add_users.py
@@ -2,6 +2,7 @@
 
 from gi.repository import Gtk, Gdk
 import pickle
+import os
 from gbi_common import password_strength
 
 # Directory use from the installer.
@@ -26,7 +27,10 @@ def save_selection(self):
         name = self.name.get_text()
         up = self.password.get_text()
         shell = self.sh
-        hf = '/home/%s' % self.user.get_text()
+        if os.path.isdir('/Users'):
+            hf = '/Users/%s' % self.user.get_text()
+        else:
+            hf = '/home/%s' % self.user.get_text()
         hst = self.host.get_text()
         ul = [uname, name, up, shell, hf]
 
@@ -86,7 +90,11 @@ def __init__(self, button3):
         self.repassword.connect("changed", self.password_verification, button3)
         self.label5 = Gtk.Label("Shell")
         shell = Gtk.ComboBoxText()
-        self.sh = '/usr/local/bin/fish'
+        try:
+            open('/Users')
+            self.sh = '/usr/local/bin/zsh'
+        except:
+            self.sh = '/usr/local/bin/fish'
         shell.append_text('sh')
         shell.append_text('csh')
         shell.append_text('tcsh')
@@ -95,7 +103,6 @@ def __init__(self, button3):
         shell.append_text('rbash')
         shell.append_text('ksh')
         shell.append_text('zsh')
-        shell.set_active(3)
         shell.connect("changed", self.on_shell)
         label = Gtk.Label('<b>Set Hostname</b>')
         label.set_use_markup(True)