diff --git a/setup/so-setup b/setup/so-setup
index b5f6d1d52..c10ff4737 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -624,10 +624,6 @@ success=$(tail -10 $setup_log | grep Failed | awk '{ print $2}')
 
 if [[ $success != 0 ]]; then SO_ERROR=1; fi # evaluate success first so it doesn't check against the output of so-allow
 
-if [[ -n $ALLOW_ROLE && -n $ALLOW_CIDR ]]; then 
-	IP=$ALLOW_CIDR so-allow -$ALLOW_ROLE >> $setup_log 2>&1
-fi
-
 if [[ -n $SO_ERROR ]]; then 
 	SKIP_REBOOT=1
 	whiptail_setup_failed
@@ -636,6 +632,10 @@ else
 	if [[ $THEHIVE == 1 ]]; then check_hive_init; fi
 fi
 
+if [[ -n $ALLOW_ROLE && -n $ALLOW_CIDR ]]; then 
+	IP=$ALLOW_CIDR so-allow -$ALLOW_ROLE >> $setup_log 2>&1
+fi
+
 install_cleanup >> $setup_log 2>&1
 
 if [[ -z $SKIP_REBOOT ]]; then shutdown -r now; else exit; fi