diff --git a/lib/sites b/lib/sites
index b2b72cb..c5dab0f 100644
--- a/lib/sites
+++ b/lib/sites
@@ -90,9 +90,7 @@ dbword_check() {
 
 
 wpinstall() {
-	local dom=${domain//./_}
-	local dom=${dom//-/_}
-	[[ $domain == "-mysql" ]] && dom="Webinoly_$(pwgen -s -1)"
+	[[ $domain == "-mysql" ]] && local dom="Webinoly_$(pwgen -s -1)" || local dom=$(echo $domain | sed "s/[^0-9A-Za-z]/_/g")
 	local ROOT_PASS=$( echo $(conf_read mysql-root) | openssl enc -d -a -salt )
 	local AUTOGENPASS_WPDB=`pwgen -s -1`
 	local setupmysql="y"
@@ -478,7 +476,10 @@ deletesite() {
 
 
 createsite() {
+	# Check domain and then prevent reserved characters for file names.
 	domain_check $domain
+	domain=$(echo $domain | sed "s/[^\.0-9A-Za-z\-]/_/g")
+	
 	if [[ $(conf_read php) != "true" && ("$wp" == [123] || "$type" == "-php") ]]; then
 		echo "${red}"
 		echo " [ERROR] PHP must be installed before you can create a WP site!"
diff --git a/webinoly.tar b/webinoly.tar
deleted file mode 100644
index c5a043f..0000000
Binary files a/webinoly.tar and /dev/null differ