diff --git a/bin/v-install-wordpress b/bin/v-install-wordpress
index 191fbc56..b5578dc9 100644
--- a/bin/v-install-wordpress
+++ b/bin/v-install-wordpress
@@ -52,27 +52,6 @@ if [ ! -d "/home/$user/web/$domain/public_html" ]; then
     exit 1;
 fi
 
-
-#----------------------------------------------------------#
-#                       Action                             #
-#----------------------------------------------------------#
-
-PROTOCOL='http'
-if [ ! -f "/home/$user/conf/web/ssl.$domain.ca" ]; then
-    /usr/local/vesta/bin/v-add-letsencrypt-domain "$user" "$domain" "www.$domain" "yes"
-fi
-
-if [ -f "/home/$user/conf/web/ssl.$domain.ca" ]; then
-    PROTOCOL='https'
-    if [ -f "/usr/local/vesta/data/templates/web/nginx/force-https.stpl" ]; then
-        /usr/local/vesta/bin/v-change-web-domain-proxy-tpl  "$user" "$domain" "force-https" "jpeg,jpg,png,gif,bmp,ico,svg,tif,tiff,css,js,ttf,otf,webp,txt,csv,rtf,doc,docx,xls,xlsx,ppt,pptx,odf,odp,ods,odt,pdf,psd,ai,eot,eps,ps,zip,tar,tgz,gz,rar,bz2,7z,aac,m4a,mp3,mp4,ogg,wav,wma,3gp,avi,flv,m4v,mkv,mov,mpeg,mpg,wmv,exe,iso,dmg,swf,woff,woff2" "yes"
-    fi
-fi
-
-WORKINGDIR="/home/$user/web/$domain/public_html"
-
-rm -rf $WORKINGDIR/*
-
 DBUSERSUF="$database";
 DBUSERSUFB="$database";
 DBUSER=$user\_$DBUSERSUFB;
@@ -97,6 +76,18 @@ PASSWDDB=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
 #                       Action                             #
 #----------------------------------------------------------#
 
+PROTOCOL='http'
+if [ ! -f "/home/$user/conf/web/ssl.$domain.ca" ]; then
+    /usr/local/vesta/bin/v-add-letsencrypt-domain "$user" "$domain" "www.$domain" "yes"
+fi
+
+if [ -f "/home/$user/conf/web/ssl.$domain.ca" ]; then
+    PROTOCOL='https'
+    if [ -f "/usr/local/vesta/data/templates/web/nginx/force-https.stpl" ]; then
+        /usr/local/vesta/bin/v-change-web-domain-proxy-tpl  "$user" "$domain" "force-https" "jpeg,jpg,png,gif,bmp,ico,svg,tif,tiff,css,js,ttf,otf,webp,txt,csv,rtf,doc,docx,xls,xlsx,ppt,pptx,odf,odp,ods,odt,pdf,psd,ai,eot,eps,ps,zip,tar,tgz,gz,rar,bz2,7z,aac,m4a,mp3,mp4,ogg,wav,wma,3gp,avi,flv,m4v,mkv,mov,mpeg,mpg,wmv,exe,iso,dmg,swf,woff,woff2" "yes"
+    fi
+fi
+
 /usr/local/vesta/bin/v-add-database "$user" "$DBUSERSUF" "$DBUSERSUF" "$PASSWDDB" "mysql"
 
 if [ ! -f "/usr/local/bin/wp" ]; then
@@ -104,8 +95,10 @@ if [ ! -f "/usr/local/bin/wp" ]; then
     wget -nv https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -O /usr/local/bin/wp
     chmod +x /usr/local/bin/wp
 fi
-    
-cd /home/$user/web/$domain/public_html
+
+WORKINGDIR="/home/$user/web/$domain/public_html"
+rm -rf $WORKINGDIR/*
+cd $WORKINGDIR
 
 sudo -H -u$user wp core download
 sudo -H -u$user wp core config --dbname=$DBUSER --dbuser=$DBUSER --dbpass=$PASSWDDB