diff --git a/action.sh b/action.sh
index 831300c..c6a4cfc 100755
--- a/action.sh
+++ b/action.sh
@@ -440,14 +440,14 @@ if [ "$ACTION" == "installwp" ]; then
   # Downloading wp-cli
   curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
   chmod +x wp-cli.phar
-  mv wp-cli.phar $HOME/bin/
+  mv wp-cli.phar $HOME/bin/wp-cli
 
   # Create database
-  mysql -e "CREATE DATABASE $WPDB;"
+  mysql -e "CREATE DATABASE $MYSQLDB;"
 
   # Use wp-cli to create config.php and install WP
-  wp core config --dbname=${MYSQLDB} --dbpass=${MYSQLPASS} --dbuser=${MYSQLUSER} --path=${WEBDIR}
-  wp core install --url="$WPDOMAIN" --title="CHANGE THIS TITLE" --admin_user=${WPUSER} --admin_password=${WPPASS} --admin_email=${WPMAIL} --path=${WEBDIR}
+  wp-cli core config --dbname=${MYSQLDB} --dbpass=${MYSQLPASS} --dbuser=${MYSQLUSER} --path=${WEBDIR}
+  wp-cli core install --url="$WPDOMAIN" --title="CHANGE THIS TITLE" --admin_user=${WPUSER} --admin_password=${WPPASS} --admin_email=${WPMAIL} --path=${WEBDIR}
 
   # Update datasheet
   TAIL='## < WORDPRESS'
diff --git a/index.php b/index.php
index 070ea26..301919e 100644
--- a/index.php
+++ b/index.php
@@ -178,7 +178,7 @@ This panel will not work without activated JavaScript.</warn></noscript>
   <div class="hide">
     <p>This install WordPress for your automatically. It only works if 
     your website directory is still empty and you didn't create a 
-    database called #&lt;yourusername#&gt;_wp.</p>
+    database called &lt;YourUsername&gt;_wp.</p>
     <form action="submit.php" method="post">
       <label>Desired WordPress login name:</label>
       <input name="user" title="WordPress Login" />