diff --git a/setup/so-functions b/setup/so-functions
index 9885c48ff..66dc20ebd 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -659,10 +659,10 @@ detect_os() {
 disable_auto_start() {
 	
 	# Remove the automated setup script from crontab, if it exists
-	crontab -u $USER -r
+	crontab -u $INSTALLUSERNAME -r
 
 	# Truncate last line of the bash profile
-	sed -i '$ d' /home/$USER/.bash_profile 
+	sed -i '$ d' /home/$INSTALLUSERNAME/.bash_profile 
 
 }
 
@@ -1156,6 +1156,11 @@ elasticsearch_pillar() {
 	cat "$pillar_file" >> "$setup_log" 2>&1
 }
 
+parse_install_username() {
+	# parse out the install username so things copy correctly
+    INSTALLUSERNAME=$(pwd | sed -E 's/\// /g'  | awk '{ print $2 }')
+}
+
 patch_pillar() {
 
 	local pillar_file=$temp_install_dir/pillar/minions/$MINION_ID.sls
@@ -1420,8 +1425,8 @@ setup_salt_master_dirs() {
 
 	# Copy over the salt code and templates
 	if [ "$setup_type" = 'iso' ]; then
-		rsync -avh --exclude 'TRANS.TBL' /home/$USER/SecurityOnion/pillar/* $default_salt_dir/pillar/ >> "$setup_log" 2>&1
-		rsync -avh --exclude 'TRANS.TBL' /home/$USER/SecurityOnion/salt/* $default_salt_dir/salt/ >> "$setup_log" 2>&1
+		rsync -avh --exclude 'TRANS.TBL' /home/$INSTALLUSERNAME/SecurityOnion/pillar/* $default_salt_dir/pillar/ >> "$setup_log" 2>&1
+		rsync -avh --exclude 'TRANS.TBL' /home/$INSTALLUSERNAME/SecurityOnion/salt/* $default_salt_dir/salt/ >> "$setup_log" 2>&1
 	else
 		cp -R ../pillar/* $default_salt_dir/pillar/ >> "$setup_log" 2>&1
 		cp -R ../salt/* $default_salt_dir/salt/ >> "$setup_log" 2>&1
diff --git a/setup/so-setup b/setup/so-setup
index a0e545b92..2d2275f5f 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -47,6 +47,9 @@ while [[ $# -gt 0 ]]; do
 done
 
 # Begin Installation pre-processing
+parse_install_username
+echo "Installing as the $INSTALLUSERNAME user." >> $setup_log 2>&1
+
 echo "---- Starting setup at $(date -u) ----" >> $setup_log 2>&1
 
 automated=no