diff --git a/so-setup-network.sh b/so-setup-network.sh
index 8af9218b2..1cfb67cc7 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -193,12 +193,18 @@ if (whiptail --title "Security Onion Setup" --yesno "Are you sure you want to in
     echo "grains:" > /etc/salt/grains
     echo "  role: so-master" >> /etc/salt/grains
 
+    cp files/master /etc/salt/master
+
     # Start salt master
     service salt-master start
     service salt-minion start
 
     touch /opt/so/saltstack/pillar/masters/$HOSTNAME.sls
 
+    salt-call state.highstate
+    salt-key -qa $HOSTNAME
+    salt-call state.highstate
+
     # Determine Disk space
     # Calculate half of available disk space for ELSA log_size_limit
     #DISK_SIZE_K=`df /nsm |grep -v "^Filesystem" | awk '{print $2}'`