diff --git a/salt/common/tools/sbin/so-fleet-setup b/salt/common/tools/sbin/so-fleet-setup
index 93c1c9d74..810b613c3 100644
--- a/salt/common/tools/sbin/so-fleet-setup
+++ b/salt/common/tools/sbin/so-fleet-setup
@@ -44,5 +44,4 @@ salt-call state.apply filebeat queue=True >> /root/fleet-setup.log
 docker stop so-nginx
 salt-call state.apply nginx queue=True >> /root/fleet-setup.log
 
-echo "Fleet Setup Complete - Login here: https://{{ MAIN_HOSTNAME }}"
-echo "Your username is $1 and your password is $2"
+echo "Fleet Setup Complete - Login here with the username and password you ran the script with: https://{{ MAIN_HOSTNAME }}"
diff --git a/salt/reactor/fleet.sls b/salt/reactor/fleet.sls
index ac4bd422f..2e929c59e 100644
--- a/salt/reactor/fleet.sls
+++ b/salt/reactor/fleet.sls
@@ -13,7 +13,6 @@ def run():
   ROLE = data['data']['role']
   ESECRET = data['data']['enroll-secret']
   MAINIP = data['data']['mainip']
-  VERSION = data['data']['version']
 
   STATICFILE = '/opt/so/saltstack/pillar/static.sls'
   SECRETSFILE = '/opt/so/saltstack/pillar/secrets.sls'
@@ -50,6 +49,7 @@ def run():
 
       PACKAGEVERSION = data['data']['current-package-version']
       MASTER = data['data']['master']
+      VERSION = data['data']['version']
       
       # Increment the package version by 1
       PACKAGEVERSION += 1