diff --git a/salt/vars/import.map.jinja b/salt/vars/import.map.jinja
index 198db31dd..f9dfa0c25 100644
--- a/salt/vars/import.map.jinja
+++ b/salt/vars/import.map.jinja
@@ -1,10 +1,12 @@
 {% from 'vars/elasticsearch.map.jinja' import ELASTICSEARCH_GLOBALS %}
+{% from 'vars/sensor.map.jinja' import SENSOR_GLOBALS %}
 
 {% set ROLE_GLOBALS = {} %}
 
 {% set IMPORT_GLOBALS =
    [
-     ELASTICSEARCH_GLOBALS
+     ELASTICSEARCH_GLOBALS,
+     SENSOR_GLOBALS
    ]
 %}
 
diff --git a/setup/so-setup b/setup/so-setup
index 06c156305..f51ddb316 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -633,6 +633,8 @@ if ! [[ -f $install_opt_file ]]; then
 		fi
 		checkin_at_boot
 		set_initial_firewall_access
+		systemctl restart salt-master
+		systemctl restart salt-minion
 		verify_setup
 	else
 		touch /root/accept_changes