diff --git a/usr/local/sbin/easyengine b/usr/local/sbin/easyengine
index 63cf56f7..7a351328 100644
--- a/usr/local/sbin/easyengine
+++ b/usr/local/sbin/easyengine
@@ -1852,6 +1852,19 @@ then
 		EESITECREATE=$4
 		WPCACHEOPTION=$5
 
+		# Auto Switch The Options
+		if [ "$EESITECREATE" = "--basic" ] || [ "$EESITECREATE" = "--w3tc" ] || [ "$EESITECREATE" = "--wpsc" ] || [ "$EESITECREATE" = "--wpfc" ]
+		then
+			if [ "$WPCACHEOPTION" = "--wpsubdir" ] || [ "$WPCACHEOPTION" = "--wpsubdirectory" ] || [ "$WPCACHEOPTION" = "--wpsubdom" ] || [ "$WPCACHEOPTION" = "--wpsubdomain" ]
+			then
+				EESITECREATE=$5
+				WPCACHEOPTION=$4
+			else
+				EESITECREATE=--wp
+				WPCACHEOPTION=$4
+			fi
+		fi
+
 		# WordPress SubDirectory Variables
 		if [ "$EESITECREATE" = "--wpsubdir" ] || [ "$EESITECREATE" = "--wpsubdirectory" ]
 		then
@@ -1872,18 +1885,6 @@ then
 			EESITECREATE=--html
 		fi
 
-		# Auto Switch The Options
-		if [ "$EESITECREATE" = "--basic" ] || [ "$EESITECREATE" = "--w3tc" ] || [ "$EESITECREATE" = "--wpsc" ] || [ "$EESITECREATE" = "--wpfc" ]
-		then
-			if [ "$WPCACHEOPTION" = "--wpsubdir" ] || [ "$WPCACHEOPTION" = "--wpsubdirectory" ] || [ "$WPCACHEOPTION" = "--wpsubdom" ] || [ "$WPCACHEOPTION" = "--wpsubdomain" ]
-			then
-				EESITECREATE=$5
-				WPCACHEOPTION=$4
-			else
-				EESITECREATE=--wp
-				WPCACHEOPTION=$4
-			fi
-		fi
 
 		# If No Cache Specified Use --basic As Default
 		if [ "$WPCACHEOPTION" = "" ] && [ "$EESITECREATE" != "--html" ] && [ "$EESITECREATE" != "--php" ]