diff --git a/setup/so-functions b/setup/so-functions
index 60c236395..7bbcb7835 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -149,7 +149,14 @@ analyst_salt_local() {
 	logCmd "yum -y update --exclude=salt*"
 
 	salt-call state.apply workstation --local --file-root=../salt/ -l info 2>&1 | tee -a outfile
-	echo "Whiptail to reboot here"
+	read -r -d '' message <<- EOM
+		Finished Analyst workstation installation.
+
+		Press ENTER to reboot.
+	EOM
+
+	whiptail --title "$whiptail_title" --msgbox "$message" 12 75
+	reboot
 	exit 0 
 
 }
diff --git a/setup/so-setup b/setup/so-setup
index 1b6725181..e767a7dde 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -1082,6 +1082,11 @@ echo "1" > /root/accept_changes
 		set_progress_str 87 'Adding user to SOC'
 		add_web_user >> $setup_log 2>&1
 	fi
+	
+	if [[ $is_analyst ]]; then
+		# Remove access to the manager from the analyst workstation
+		rm -rf /root/.ssh/so.key*
+	fi
 
 	set_progress_str 90 'Enabling checkin at boot'
 	checkin_at_boot >> $setup_log 2>&1
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 46fbf3ff7..a141485d7 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -55,7 +55,7 @@ whiptail_analyst_nongrid_iso() {
 
 	read -r -d '' message <<- EOM
 	
-	You have selected this Analyst workstation to be independant.
+	You have selected this Analyst workstation to be independent.
 
 	Would you still like to have the graphical interface loaded at boot?
 
@@ -73,7 +73,7 @@ whiptail_analyst_nongrid_network() {
 
 	read -r -d '' message <<- EOM
 	
-	You have selected this Analyst workstation to be independant.
+	You have selected this Analyst workstation to be independent.
 
 	Would you still like to install and load the graphical interface?