diff --git a/api/setup/saveWizard.cfm b/api/setup/saveWizard.cfm
index f9dc4c7..6159b0d 100644
--- a/api/setup/saveWizard.cfm
+++ b/api/setup/saveWizard.cfm
@@ -218,12 +218,10 @@ try {
         response.steps.append("Created address record (ID: " & addressId & ")");
 
         // Auto-geocode address in background
-        </cfscript>
-        <cfthread action="run" name="geocode_#addressId#" addressId="#addressId#">
-            <cfinclude template="/api/inc/geocode.cfm">
-            <cfset geocodeAddressById(attributes.addressId)>
-        </cfthread>
-        <cfscript>
+        thread action="run" name="geocode_#addressId#" addressId=addressId {
+            include template="/api/inc/geocode.cfm";
+            geocodeAddressById(attributes.addressId);
+        }
 
         // Get community meal type (1=provide meals, 2=food bank donation)
         communityMealType = structKeyExists(wizardData, "communityMealType") && isSimpleValue(wizardData.communityMealType) ? val(wizardData.communityMealType) : 1;