diff --git a/nextcloud-startup-script.sh b/nextcloud-startup-script.sh
index b7947c14..0207bc53 100644
--- a/nextcloud-startup-script.sh
+++ b/nextcloud-startup-script.sh
@@ -11,7 +11,6 @@ WWW_ROOT=/var/www
 NCPATH=$WWW_ROOT/nextcloud
 NCDATA=/var/ncdata
 SCRIPTS=/var/scripts
-PW_FILE=/var/mysql_password.txt # Keep in sync with nextcloud_install_production.sh
 IFACE=$(lshw -c network | grep "logical name" | awk '{print $3; exit}')
 CLEARBOOT=$(dpkg -l linux-* | awk '/^ii/{ print $2}' | grep -v -e `uname -r | cut -f1,2 -d"-"` | grep -e [0-9] | xargs sudo apt -y purge)
 PHPMYADMIN_CONF="/etc/apache2/conf-available/phpmyadmin.conf"
@@ -698,12 +697,15 @@ echo -e "|         \e[0mLogin to Nextcloud in your browser:\e[36m" $ADDRESS2"\e[
 echo    "|                                                                    |"
 echo -e "|         \e[0mPublish your server online! \e[36mhttps://goo.gl/iUGE2U\e[32m          |"
 echo    "|                                                                    |"
-echo -e "|      \e[0mYour MySQL password is stored in: \e[36m$PW_FILE\e[32m     |"
+echo -e "|         \e[0mTo login to MySQL just type: \e[36m'mysql -u root'\e[32m               |"
+echo    "|                                                                    |"
+echo -e "|   \e[0mTo update this VM just type: \e[36m'sudo bash /var/scripts/update.sh'\e[32m  |"
 echo    "|                                                                    |"
 echo -e "|    \e[91m#################### Tech and Me - 2017 ####################\e[32m    |"
 echo    "+--------------------------------------------------------------------+"
 echo
 echo -e "\e[0m"
+
 # VPS?
 function ask_yes_or_no() {
     read -p "$1 ([y]es or [N]o): "
diff --git a/static/change_mysql_pass.sh b/static/change_mysql_pass.sh
index 9868fe97..4c7d616e 100644
--- a/static/change_mysql_pass.sh
+++ b/static/change_mysql_pass.sh
@@ -5,6 +5,7 @@
 SHUF=$(shuf -i 17-20 -n 1)
 NEWMYSQLPASS=$(cat /dev/urandom | tr -dc "a-zA-Z0-9@#*=" | fold -w $SHUF | head -n 1)
 PW_FILE=/var/mysql_password.txt
+MYCNF=/root/.my.cnf
 OLDMYSQL=$(cat $PW_FILE)
 
 echo "Generating new MySQL root password..."
@@ -13,12 +14,21 @@ mysqladmin -u root -p$OLDMYSQL password $NEWMYSQLPASS > /dev/null 2>&1
 if [ $? -eq 0 ]
 then
     echo -e "\e[32mYour new MySQL root password is: $NEWMYSQLPASS\e[0m"
-    echo "$NEWMYSQLPASS" > $PW_FILE
+    cat << LOGIN > "$MYCNF"
+[client]
+password='$NEWMYSQLPASS'
+LOGIN
+    chmod 0600 $MYCNF
 else
     echo "Changing MySQL root password failed."
     echo "Your old password is: $OLDMYSQL"
+    cat << LOGIN > "$MYCNF"
+[client]
+password='$OLDMYSQLPASS'
+LOGIN
+    chmod 0600 $MYCNF
 fi
-sleep 1
 
-exit 0
+# Remove unessecary password file
+rm $PW_FILE