diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart
index a2c99138..f2749745 100644
--- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart
+++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart
@@ -83,7 +83,7 @@ class _FormDataBodyState extends ConsumerState<FormDataWidget> {
           key: ValueKey("$selectedId-$index-form-row-$seed"),
           cells: <DataCell>[
             DataCell(
-              EnvCellField(
+              CellField(
                 keyId: "$selectedId-$index-form-k-$seed",
                 initialValue: formRows[index].name,
                 hintText: kHintAddFieldName,
diff --git a/lib/utils/envvar_utils.dart b/lib/utils/envvar_utils.dart
index 230cf535..4bf9af1c 100644
--- a/lib/utils/envvar_utils.dart
+++ b/lib/utils/envvar_utils.dart
@@ -85,6 +85,13 @@ HttpRequestModel substituteHttpRequestModel(
         value: substituteVariables(param.value, envMap, activeEnvironmentId),
       );
     }).toList(),
+    formData: httpRequestModel.formData?.map((formData) {
+      return formData.copyWith(
+        name: 
+            substituteVariables(formData.name, envMap, activeEnvironmentId) ?? "",
+        value: substituteVariables(formData.value, envMap, activeEnvironmentId) ?? "",
+      );
+    }).toList(),
     body: substituteVariables(
       httpRequestModel.body,
       envMap,