diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 93642a7b..26cd3a07 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -98,31 +98,35 @@ case "$1" in
 	;;
 	
 	newsite)
-		mkdir -p /var/www/${2}/{public_folder,nginx_logs}
+		NEW_SITE={2}
+		rm -f /etc/nginx/sites-available/${NEW_SITE}.conf
+		rm -rf /var/www/${NEW_SITE}
+		
+		mkdir -p /var/www/${NEW_SITE}/{public_folder,nginx_logs}
 		echo -e "server {
 	listen 8443 ssl http2;
 	listen 8080;
 
 
-	server_name ${2};
-	set $base /var/www/${2};
-	root $base/public_html;
+	server_name ${NEW_SITE};
+	set \$base /var/www/${NEW_SITE};
+	root \$base/public_html;
 
-	access_log  /var/www/${2}/nginx_logs/access.log;
-	error_log  /var/www/${2}/nginx_logs/error.log warn;
+	access_log  /var/www/${NEW_SITE}/nginx_logs/access.log;
+	error_log  /var/www/${NEW_SITE}/nginx_logs/error.log warn;
 
-	ssl_certificate /etc/letsencrypt/live/${2}/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/${2}/privkey.pem;
+	ssl_certificate /etc/letsencrypt/live/${NEW_SITE}/fullchain.pem;
+	ssl_certificate_key /etc/letsencrypt/live/${NEW_SITE}/privkey.pem;
 	include conf.d/include/ssl-ciphers.conf;
 
 	index index.php;
 
 	location / {
-		try_files $uri $uri/ /index.php?$query_string;
+		try_files \$uri \$uri/ /index.php?\$query_string;
 		include conf.d/include/force-ssl.conf;
 	}
 
-	location ~ \.php$ {
+	location ~ \.php\$ {
 		fastcgi_pass unix:/var/run/php/php5.6-fpm.sock;
 		include conf.d/include/php_fastcgi.conf;
 	}
@@ -130,8 +134,8 @@ case "$1" in
 	include conf.d/include/general.conf;
 	include conf.d/include/letsencrypt-acme-challenge.conf;
 }
-" > /etc/nginx/sites-available/${2}.conf
-	nodemgmt set-permissions {$2}
+" > /etc/nginx/sites-available/${NEW_SITE}.conf
+	nodemgmt set-permissions {${NEW_SITE}}
 	;;
 	
 	update)