diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js
index 90f59b1f89..e4adef0e38 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js
@@ -39,7 +39,6 @@ var validateInline = {};
 var clearInline = {};
 var validateStep = {};
 var hasPolicyProfileScript = false;
-var isCorrectiveActionProfileAdded = false;
 
 var enableInlineError = function (inputField, errorMsg, errorSign) {
     var fieldIdentifier = "#" + inputField;
@@ -224,31 +223,26 @@ stepForwardFrom["policy-profile"] = function () {
     }
 
     // add policy correction action page
-    if (!isCorrectiveActionProfileAdded) {
-        var policyCorrectiveActionTemplateSrc =
-                "/public/cdmf.unit.policy.corrective-action/templates/policy-corrective-action.hbs";
-        var policyCorrectiveActionScriptSrc =
-                "/public/cdmf.unit.policy.corrective-action/js/policy-corrective-action.js";
-        var policyCorrectiveActionTemplateCacheKey = "policy-corrective-action";
-
-        $.template(policyCorrectiveActionTemplateCacheKey, context + policyCorrectiveActionTemplateSrc,
-                   function (template) {
-            var content = template(
-                    {
-                        "deviceType": policy["platform"],
-                        "correctivePolicies": $("#logged-in-user").data("corrective-policies")
-                    }
-            );
-            $("#select-general-policy-type").html(content)
-        });
-
+    var policyCorrectiveActionTemplateSrc =
+            "/public/cdmf.unit.policy.corrective-action/templates/policy-corrective-action.hbs";
+    var policyCorrectiveActionScriptSrc =
+            "/public/cdmf.unit.policy.corrective-action/js/policy-corrective-action.js";
+    var policyCorrectiveActionTemplateCacheKey = "policy-corrective-action";
+
+    $.template(policyCorrectiveActionTemplateCacheKey, context + policyCorrectiveActionTemplateSrc,
+               function (template) {
+        var content = template(
+                {
+                    "deviceType": policy["platform"],
+                    "correctivePolicies": $("#logged-in-user").data("corrective-policies")
+                }
+        );
+        $("#select-general-policy-type").html(content);
         var script = document.createElement('script');
         script.type = 'text/javascript';
         script.src = context + policyCorrectiveActionScriptSrc;
         document.head.append(script);
-
-        isCorrectiveActionProfileAdded = true
-    }
+    });
 
     // updating next-page wizard title with selected platform
     $("#policy-type-page-wizard-title").text("ADD " + policy["platform"] + " POLICY");
@@ -645,8 +639,6 @@ $(document).ready(function () {
         }
     });
 
-    isCorrectiveActionProfileAdded = false;
-
     $('input[type=radio][name=policy-type-radio-btn]').change(function() {
         if ($(this).val() === "CORRECTIVE") {
             $("#select-general-policy-type").addClass("hidden");
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
index 9ae9afc208..82781944ca 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
@@ -42,7 +42,6 @@ var currentlyEffected = {};
 var validateInline = {};
 var clearInline = {};
 var hasPolicyProfileScript = false;
-var isCorrectiveActionProfileAdded = false;
 
 var enableInlineError = function (inputField, errorMsg, errorSign) {
     var fieldIdentifier = "#" + inputField;
@@ -285,46 +284,41 @@ stepForwardFrom["policy-profile"] = function () {
     $("input[name=policy-type-radio-btn][value=" + policyType + "]").prop("checked", true).trigger('change');
 
     // add policy correction action page
-    if (!isCorrectiveActionProfileAdded) {
-        var policyCorrectiveActionTemplateSrc =
-                "/public/cdmf.unit.policy.corrective-action/templates/policy-corrective-action.hbs";
-        var policyCorrectiveActionScriptSrc =
-                "/public/cdmf.unit.policy.corrective-action/js/policy-corrective-action.js";
-        var policyCorrectiveActionTemplateCacheKey = "policy-corrective-action";
-
-        $.template(policyCorrectiveActionTemplateCacheKey, context + policyCorrectiveActionTemplateSrc,
-                   function (template) {
-                       var content = template(
-                               {
-                                   "deviceType": policy["platform"],
-                                   "correctivePolicies": $("#logged-in-user").data("corrective-policies")
-                               }
-                       );
-                       $("#select-general-policy-type").html(content);
-                       if ("GENERAL" === policyType && currentlyEffected.correctiveActions &&
-                            currentlyEffected.correctiveActions.length > 0) {
-                           currentlyEffected.correctiveActions.forEach(function (correctiveAction) {
-                              if ("POLICY" === correctiveAction.actionType) {
-                                  if ($("#corrective-policy-input option[value=" + correctiveAction.policyId + "]").length > 0) {
-                                      $("#corrective-policy-input").val(correctiveAction.policyId);
-                                  } else {
-                                      $("#corrective-action-policy-id-missing-msg").removeClass("hidden");
-                                  }
-                                  // returned from for each since currently only supported corrective action type is
-                                  // POLICY.
-                                  return true;
+    var policyCorrectiveActionTemplateSrc =
+            "/public/cdmf.unit.policy.corrective-action/templates/policy-corrective-action.hbs";
+    var policyCorrectiveActionScriptSrc =
+            "/public/cdmf.unit.policy.corrective-action/js/policy-corrective-action.js";
+    var policyCorrectiveActionTemplateCacheKey = "policy-corrective-action";
+
+    $.template(policyCorrectiveActionTemplateCacheKey, context + policyCorrectiveActionTemplateSrc,
+               function (template) {
+                   var content = template(
+                           {
+                               "deviceType": policy["platform"],
+                               "correctivePolicies": $("#logged-in-user").data("corrective-policies")
+                           }
+                   );
+                   $("#select-general-policy-type").html(content);
+                   if ("GENERAL" === policyType && currentlyEffected.correctiveActions &&
+                        currentlyEffected.correctiveActions.length > 0) {
+                       currentlyEffected.correctiveActions.forEach(function (correctiveAction) {
+                          if ("POLICY" === correctiveAction.actionType) {
+                              if ($("#corrective-policy-input option[value=" + correctiveAction.policyId + "]").length > 0) {
+                                  $("#corrective-policy-input").val(correctiveAction.policyId);
+                              } else {
+                                  $("#corrective-action-policy-id-missing-msg").removeClass("hidden");
                               }
-                           });
-                       }
-                   });
-
-        var script = document.createElement('script');
-        script.type = 'text/javascript';
-        script.src = context + policyCorrectiveActionScriptSrc;
-        document.head.prepend(script);
-
-        isCorrectiveActionProfileAdded = true;
-    }
+                              // returned from for each since currently only supported corrective action type is
+                              // POLICY.
+                              return true;
+                          }
+                       });
+                   }
+                   var script = document.createElement('script');
+                   script.type = 'text/javascript';
+                   script.src = context + policyCorrectiveActionScriptSrc;
+                   document.head.prepend(script);
+               });
 
     $(".policy-type-loading-corrective-actions").addClass("hidden");
 
@@ -768,8 +762,6 @@ $(document).ready(function () {
 
     $("#policy-profile-wizard-steps").html($(".wr-steps").html());
 
-    isCorrectiveActionProfileAdded = false;
-
     $('input[type=radio][name=policy-type-radio-btn]').change(function() {
         if ($(this).val() === "CORRECTIVE") {
             $("#select-general-policy-type").addClass("hidden");