diff --git a/scripts/general.sh b/scripts/general.sh
index 7af7ad4..94d7601 100755
--- a/scripts/general.sh
+++ b/scripts/general.sh
@@ -3,7 +3,7 @@
 logins () {
   echo ===========================================================
   echo
-  echo "- Mattermost: http://localhost:8065" with the logins above
+  echo "- Mattermost: http://localhost:8065" with the logins above if you ran setup
   echo "- Keycloak: http://localhost:8080" with 'admin' / 'admin'
   echo "- Grafana: http://localhost:3000" with 'admin' / 'admin'
   echo "    - All Mattermost Grafana charts are setup."
diff --git a/scripts/mattermost.sh b/scripts/mattermost.sh
index e3b7acc..b43fcef 100755
--- a/scripts/mattermost.sh
+++ b/scripts/mattermost.sh
@@ -15,7 +15,7 @@ setup() {
     echo "If you are curious about the config changes check out the file ./files/mattermost/defaultConfig.json"
     echo "If you don't want to do this, just press enter."
     echo
-    read -p "Y / N   " -n 1 -r
+    read -p "y / N   " -n 1 -r
     echo # (optional) move to a new line
     if [[ $REPLY =~ ^[Yy]$ ]]; then
       echo ===========================================================
@@ -30,6 +30,9 @@ setup() {
 
       echoLogins
       exit 0
+    else 
+      echo "skipping test Data setup for Mattermost"
+      exit 0
     fi
   fi