diff --git a/setup/so-functions b/setup/so-functions
index df19a17b7..1bbe4dccc 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() {
diff --git a/setup/so-setup b/setup/so-setup
index 0c19fcfee..a0e545b92 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -342,7 +342,7 @@ if [[ "$setup_type" == 'iso' ]]; then
 	set_management_interface
 
 	#add_admin_user
-	#disable_onion_user
+	disable_auto_start
 fi
 
 {