diff --git a/setup/so-functions b/setup/so-functions
index df19a17b7..9885c48ff 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -656,12 +656,14 @@ detect_os() {
 
 }
 
-disable_onion_user() {
-	# Disable the default account cause security.
-	usermod -L onion
-
+disable_auto_start() {
+	
 	# Remove the automated setup script from crontab, if it exists
-	crontab -u onion -r
+	crontab -u $USER -r
+
+	# Truncate last line of the bash profile
+	sed -i '$ d' /home/$USER/.bash_profile 
+
 }
 
 disable_misc_network_features() {
@@ -1418,8 +1420,8 @@ setup_salt_master_dirs() {
 
 	# Copy over the salt code and templates
 	if [ "$setup_type" = 'iso' ]; then
-		rsync -avh --exclude 'TRANS.TBL' /home/onion/SecurityOnion/pillar/* $default_salt_dir/pillar/ >> "$setup_log" 2>&1
-		rsync -avh --exclude 'TRANS.TBL' /home/onion/SecurityOnion/salt/* $default_salt_dir/salt/ >> "$setup_log" 2>&1
+		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
 	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 eab45388a..a0e545b92 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -188,7 +188,7 @@ case "$setup_type" in
 			whiptail_management_interface_dns_search
 		fi
 
-		collect_adminuser_inputs
+		#collect_adminuser_inputs
 		;;
 	'network')
 		whiptail_network_notice
@@ -341,8 +341,8 @@ if [[ "$setup_type" == 'iso' ]]; then
 	set_hostname_iso
 	set_management_interface
 
-	add_admin_user
-	disable_onion_user
+	#add_admin_user
+	disable_auto_start
 fi
 
 {