diff --git a/nextcloud-startup-script.sh b/nextcloud-startup-script.sh
index b06f960ea9..c41df2043d 100644
--- a/nextcloud-startup-script.sh
+++ b/nextcloud-startup-script.sh
@@ -509,7 +509,7 @@ dpkg-reconfigure openssh-server
 
 # Generate new MySQL password
 echo
-bash $SCRIPTS/change_mysql_pass.sh
+bash $SCRIPTS/change_mysql_pass.sh && wait
 if [ $? -eq 0 ]
 then
 rm $SCRIPTS/change_mysql_pass.sh
@@ -517,7 +517,6 @@ echo "[mysqld]" >> /root/.my.cnf
 echo "innodb_large_prefix=on" >> /root/.my.cnf
 echo "innodb_file_format=barracuda" >> /root/.my.cnf
 echo "innodb_file_per_table=1" >> /root/.my.cnf
-sleep 3
 fi
 
 # Enable UTF8mb4 (4-byte support)
@@ -526,7 +525,7 @@ PW_FILE=/var/mysql_password.txt
 echo
 echo "Enabling UTF8mb4 support on $NCDB...."
 sudo /etc/init.d/mysql restart
-RESULT=`mysqlshow --user=root --password=$(cat $PW_FILE) $NCDB| grep -v Wildcard | grep -o $NCDB`
+RESULT="mysqlshow --user=root --password=$(cat $PW_FILE) $NCDB| grep -v Wildcard | grep -o $NCDB"
 if [ "$RESULT" == "$NCDB" ]; then
     mysql -u root -e "ALTER DATABASE $NCDB CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"
 fi