diff --git a/etl/eligibility/ha_15_32/ha16_app.py b/etl/eligibility/ha_15_32/ha16_app.py
index f930452e..a1d25c53 100644
--- a/etl/eligibility/ha_15_32/ha16_app.py
+++ b/etl/eligibility/ha_15_32/ha16_app.py
@@ -293,8 +293,11 @@ def get_epc_data(data, cleaned, cleaning_data, created_at):
         eligibility.check_eco4()
 
         if eligibility.eco4_warmfront["eligible"]:
+            if eligibility.epc["uprn"] == "":
+                eligibility.epc["uprn"] = int(property_meta["row_id"].split("_")[1])
+
             scoring_dictionary = prepare_model_data_row(
-                property_id=eligibility.epc["uprn"],
+                property_id=property_meta["row_id"],
                 modelling_epc=eligibility.epc,
                 cleaned=cleaned,
                 cleaning_data=cleaning_data,
@@ -333,7 +336,7 @@ def get_epc_data(data, cleaned, cleaning_data, created_at):
 def app():
     data = load_data()
 
-    data["row_id"] = ["ha16" + str(i) for i in range(0, len(data))]
+    data["row_id"] = ["ha16_" + str(i) for i in range(0, len(data))]
 
     cleaned = read_from_s3(
         s3_file_name="cleaned_epc_data/cleaned.bson",