diff --git a/setup/so-setup b/setup/so-setup
index e09646020..5f96106a5 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -672,7 +672,7 @@ if ! [[ -f $install_opt_file ]]; then
 		logCmd "so-soc-restart"
 		title "Setting up Elastic Fleet"
 		logCmd "salt-call state.apply elasticfleet.config"
-        logCmd "so-elastic-fleet-setup"
+        	logCmd "so-elastic-fleet-setup"
 		if [[ ! $is_import ]]; then
 			title "Setting up Playbook"
 			logCmd "so-playbook-reset"
@@ -694,6 +694,8 @@ if ! [[ -f $install_opt_file ]]; then
 		reserve_ports
 		# Set the version
 		mark_version
+		# Disable the setup from prompting at login
+		disable_auto_start
 		info "Clearing the old manager"
 		# Remove old manager if re-install
 		clear_manager