diff --git a/salt/mysql/etc/my.cnf b/salt/mysql/etc/my.cnf
index e37f690dc..243cc4c51 100644
--- a/salt/mysql/etc/my.cnf
+++ b/salt/mysql/etc/my.cnf
@@ -29,3 +29,6 @@ symbolic-links=0
 
 log-error=/var/log/mysql/mysqld.log
 pid-file=/var/run/mysqld/mysqld.pid
+
+# Switch back to the native password module so that playbook can connect
+default_authentication_plugin=mysql_native_password
\ No newline at end of file
diff --git a/setup/so-verify b/setup/so-verify
index 685e50d81..77cdf7c8e 100755
--- a/setup/so-verify
+++ b/setup/so-verify
@@ -17,7 +17,7 @@ using_iso() {
     if [ "$setup_type" == "iso" ]; then
         return 0
     fi
-    return 0
+    return 1
 }
 
 # Check entire setup log for errors or unexpected salt states
@@ -54,7 +54,8 @@ log_has_errors() {
 # For ISO installs, we know nothing else can be running on this server, so there should be
 # nothing in any mail spool dir.
 cron_error_in_mail_spool() {
-    if find /var/spool/mail/ -type f -size +0 &> /dev/null; then
+    count=$(find /var/spool/mail/ -type f -size +0 | wc -l)
+    if [[ $count -ne 0 ]]; then
         return 0
     fi
     return 1