diff --git a/install_mysql-5.7.sh b/install_mysql-5.7.sh
index f9d7561..c6a3a0a 100755
--- a/install_mysql-5.7.sh
+++ b/install_mysql-5.7.sh
@@ -2374,17 +2374,6 @@ else
    error Konnte MySQL Datenbankserver nicht starten..
 fi
 
-echononl "Run \"mysql_upgrade -uroot\" - this may take some (long) time.."
-echo "" >> ${logdir}/main.log
-echo "${MYSQL_INSTALL_DIR}/bin/mysql_upgrade -uroot -p$MYSQL_ROOT_PW" >> ${logdir}/main.log
-${MYSQL_INSTALL_DIR}/bin/mysql_upgrade -uroot -p$MYSQL_ROOT_PW >> ${logdir}/main.log 2>&1
-if [ "$?" = "0" ]; then
-   echo_ok
-else
-   echo_failed
-   error "Script \"mysql_upgrade -uroot\" failed!"
-fi
-
 if ! $UPDATE_MYSQL ; then
 
    ## - Delete rows with empty 'User' from table mysql.user
@@ -2419,9 +2408,26 @@ if ! $UPDATE_MYSQL ; then
       echo_failed
       error Das Laden/Erneuern der Berechtigungen für die MySQL Datenbank ist fehlgeschlagen..
    fi
+
+else
+
+   ## - Run mysql_upgrade
+   ## -
+   echononl "Run \"mysql_upgrade -uroot\" - this may take some (long) time.."
+   echo "" >> ${logdir}/main.log
+   echo "${MYSQL_INSTALL_DIR}/bin/mysql_upgrade -uroot -p$MYSQL_ROOT_PW" >> ${logdir}/main.log
+   ${MYSQL_INSTALL_DIR}/bin/mysql_upgrade -uroot -p$MYSQL_ROOT_PW >> ${logdir}/main.log 2>&1
+   if [ "$?" = "0" ]; then
+      echo_ok
+   else
+      echo_failed
+      error "Script \"mysql_upgrade -uroot\" failed!"
+   fi
+
 fi
 
 
+
 _sys_maint_cnf_needed=false
 if $UPDATE_MYSQL ; then
    echononl "Copy 'sys-maint.cnf from old installation to the new one.."