diff --git a/files/master b/files/master
index 380c1bb24..3c95276ab 100644
--- a/files/master
+++ b/files/master
@@ -25,7 +25,7 @@
 # permissions to allow the specified user to run the master. The exception is
 # the job cache, which must be deleted if this user is changed. If the
 # modified files cause conflicts, set verify_env to False.
-user: socore
+# user: socore
 
 # The port used by the communication interface. The ret (return) port is the
 # interface used for the file server, authentication, job returns, etc.
diff --git a/so-setup-network.sh b/so-setup-network.sh
index fc6fca943..b46d6e587 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -198,7 +198,8 @@ if (whiptail --title "Security Onion Setup" --yesno "Are you sure you want to in
 
     # Copy the master config over
     cp files/master /etc/salt/master
-    chown -R socore:socore /etc/salt
+    # Comment this out for now
+    # chown -R socore:socore /etc/salt
 
     # Start salt master and minion
     service salt-master start
@@ -208,7 +209,7 @@ if (whiptail --title "Security Onion Setup" --yesno "Are you sure you want to in
     touch /opt/so/saltstack/pillar/masters/$HOSTNAME.sls
 
     salt-call state.highstate
-    salt-key -ya $HOSTNAME
+    salt-key -qya $HOSTNAME
     salt-call state.highstate
 
     # Determine Disk space