diff --git a/attacks/Captive Portal/attack.sh b/attacks/Captive Portal/attack.sh
index 21244ad..b544a2a 100644
--- a/attacks/Captive Portal/attack.sh	
+++ b/attacks/Captive Portal/attack.sh	
@@ -164,14 +164,21 @@ function captive_portal_set_site() {
 	case "$site" in
 		"$DialogOptionCaptivePortalGeneric")
 			source $FLUXIONPath/attacks/Captive\ Portal/sites/generic/$siteLanguage
-			 captive_portal_generic;;
+			captive_portal_generic;;
 		"$general_back")
 			captive_portal_unset_cert
 			captive_portal_unset_site
 			return 1;;
 		* )
 			mkdir $FLUXIONWorkspacePath/captive_portal &>$FLUXIONOutputDevice
-			cp -r $FLUXIONPath/attacks/Captive\ Portal/sites/$sitePath.portal/* $FLUXIONWorkspacePath/captive_portal;;
+			cp -r $FLUXIONPath/attacks/Captive\ Portal/sites/$sitePath.portal/* \
+				  $FLUXIONWorkspacePath/captive_portal
+			find $FLUXIONWorkspacePath/captive_portal/ -type f -exec \
+				 sed -i -e 's/$APTargetSSID/'"$APTargetSSID"'/g' {} \;
+			find $FLUXIONWorkspacePath/captive_portal/ -type f -exec \
+				 sed -i -e 's/$APTargetMAC/'"$APTargetMAC"'/g' {} \;
+			find $FLUXIONWorkspacePath/captive_portal/ -type f -exec \
+				 sed -i -e 's/$APTargetChannel/'"$APTargetChannel"'/g' {} \;;;
 	esac
 }
 
diff --git a/fluxion.sh b/fluxion.sh
index 8312ec5..7f21366 100755
--- a/fluxion.sh
+++ b/fluxion.sh
@@ -750,9 +750,9 @@ function set_target_ap() {
 						TargetAPCandidatesMAC[@]
 
 	APTargetSSID=${IOQueryFormatFields[1]}
-	APTargetChannel=${IOQueryFormatFields[4]}
-	APTargetEncryption=${IOQueryFormatFields[5]}
-	APTargetMAC=${IOQueryFormatFields[6]}
+	APTargetChannel=${IOQueryFormatFields[5]}
+	APTargetEncryption=${IOQueryFormatFields[6]}
+	APTargetMAC=${IOQueryFormatFields[7]}
 	APTargetMakerID=${APTargetSSID:0:8}
 	APTargetMaker=$(macchanger -l | grep ${APTargetMakerID,,})
 	#echo $APTargetSSID $APTargetChannel $APTargetEncryption $APTargetMAC