diff --git a/salt/top.sls b/salt/top.sls
index 95acae1fd..4d60b01c0 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -100,7 +100,7 @@ base:
     - schedule
     - soctopus
     {%- if THEHIVE != 0 %}
-    - hive
+    - thehive
     {%- endif %}
     {%- if PLAYBOOK != 0 %}
     - playbook
@@ -149,7 +149,7 @@ base:
     {%- endif %}
     - soctopus
     {%- if THEHIVE != 0 %}
-    - hive
+    - thehive
     {%- endif %}
     {%- if PLAYBOOK != 0 %}
     - playbook
@@ -203,7 +203,7 @@ base:
     - schedule
     - soctopus
     {%- if THEHIVE != 0 %}
-    - hive
+    - thehive
     {%- endif %}
     {%- if PLAYBOOK != 0 %}
     - playbook
@@ -318,7 +318,7 @@ base:
     {%- endif %}
     - soctopus
     {%- if THEHIVE != 0 %}
-    - hive
+    - thehive
     {%- endif %}
     {%- if PLAYBOOK != 0 %}
     - playbook
diff --git a/setup/so-functions b/setup/so-functions
index bb214d40f..9bb756534 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1013,7 +1013,7 @@ parse_options() {
 			export {https,ftp,rsync,all}_proxy="$http_proxy"
 			;;
 		"--allow-analyst"|"--allow=a")
-			allow='a'
+			export allow='a'
 			;;
 		*)
 			if  [[ $1 = --* ]]; then
diff --git a/setup/so-setup b/setup/so-setup
index af8740159..28e4be6c2 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -549,7 +549,9 @@ fi
 success=$(tail -10 $setup_log | grep Failed | awk '{ print $2}')
 if [[ "$success" = 0 ]]; then
 	whiptail_setup_complete
-	if [[ -n $allow ]]; then so-allow -$allow; fi
+	if [[ -n $allow ]]; then 
+		so-allow -$allow >> $setup_log 2>&1
+	fi
 	if [[ $THEHIVE == 1 ]]; then
 		check_hive_init_then_reboot
 	else