diff --git a/setup/so-functions b/setup/so-functions
index 0d0e09d01..8606de688 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -457,7 +457,7 @@ create_local_directories() {
 	echo "Creating local pillar and salt directories"
 
 	for i in "pillar" "salt"; do
-		for d in `find ./$i/ -type d`; do
+		for d in `find ../$i/ -type d`; do
     		mkdir -p $local_salt_dir/$d
       	done
 		chown -R socore:socore $local_salt_dir/$i
diff --git a/setup/so-setup b/setup/so-setup
index 5b48c35cb..817887c84 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -362,11 +362,11 @@ fi
 
 	if [[ $is_master || $is_helix ]]; then
 		set_progress_str 10 'Configuring Salt master'
+		create_local_directories >> $setup_log 2>&1
+		addtotab_generate_templates >> $setup_log 2>&1
 		copy_master_config >> $setup_log 2>&1
 		setup_salt_master_dirs >> $setup_log 2>&1
 		firewall_generate_templates >> $setup_log 2>&1
-		create_local_directories >> $setup_log 2>&1
-		addtotab_generate_templates >> $setup_log 2>&1
 		
 		set_progress_str 11 'Updating sudoers file for soremote user'
 		update_sudoers >> $setup_log 2>&1