diff --git a/deploy/runtime/ui/Financial Analysis Host Developer Parameters.json b/deploy/runtime/ui/Financial Analysis Host Developer Parameters.json
index f7bd976a1..429a2b308 100644
--- a/deploy/runtime/ui/Financial Analysis Host Developer Parameters.json	
+++ b/deploy/runtime/ui/Financial Analysis Host Developer Parameters.json	
@@ -864,8 +864,7 @@
         "  property('analysis_period_warning','caption',txt);",
         "  refresh();\r",
         "  change_tax_array_length();\r",
-        "  change_depreciation_length();\r",
-        "  change_curtailment_price_length();",
+        "  change_depreciation_length();",
         "};",
         ""
     ]
diff --git a/deploy/runtime/ui/Financial Analysis Parameters.json b/deploy/runtime/ui/Financial Analysis Parameters.json
index 42aea7edd..518521503 100644
--- a/deploy/runtime/ui/Financial Analysis Parameters.json	
+++ b/deploy/runtime/ui/Financial Analysis Parameters.json	
@@ -632,8 +632,12 @@
         "  txt = analysis_period_message();",
         "  property('analysis_period_warning','caption',txt);\r",
         "  change_tax_array_length();\r",
-        "  change_curtailment_price_length();\r",
-        "  change_depreciation_length();",
+        "  if  ( financing() == 'Single Owner') {\r",
+        "\tchange_curtailment_price_length();\r",
+        "  }\r",
+        "  if (financing() != 'Residential' && financing() != 'LCOE Calculator' && financing() != 'None') {\r",
+        "\tchange_depreciation_length();\r",
+        "  }",
         "};",
         ""
     ]