diff --git a/api/src/main/java/org/openmrs/module/pihcore/apploader/CustomAppLoaderConstants.java b/api/src/main/java/org/openmrs/module/pihcore/apploader/CustomAppLoaderConstants.java
index f7f9f3aa4..36790868c 100644
--- a/api/src/main/java/org/openmrs/module/pihcore/apploader/CustomAppLoaderConstants.java
+++ b/api/src/main/java/org/openmrs/module/pihcore/apploader/CustomAppLoaderConstants.java
@@ -268,6 +268,8 @@ public static final class Extensions {
 
         public static final String DEATH_CERTIFICATE_HEADER_EXTENSION = "pih.header.deathCertificate";
 
+        public static final String HIV_PROGRAM_LOCATION_WARNING_HEADER_EXTENSION = "pih.header.hivProgramLocationWarning";
+
         public static final String REPORTING_AD_HOC_ANALYSIS = "reportingui.dataExports.adHoc";
 
         public static final String ALLERGY_UI_VISIT_NOTE_NEXT_SUPPORT = "allergyui.allergires.visitNoteNextSupport";
diff --git a/api/src/main/java/org/openmrs/module/pihcore/apploader/CustomAppLoaderFactory.java b/api/src/main/java/org/openmrs/module/pihcore/apploader/CustomAppLoaderFactory.java
index 54bb025c6..ebe91b464 100644
--- a/api/src/main/java/org/openmrs/module/pihcore/apploader/CustomAppLoaderFactory.java
+++ b/api/src/main/java/org/openmrs/module/pihcore/apploader/CustomAppLoaderFactory.java
@@ -260,6 +260,10 @@ private void loadAppsAndExtensions() throws UnsupportedEncodingException {
         if (config.isComponentEnabled(Components.DEATH_CERTIFICATE)) {
             enableDeathCertificate();
         }
+        if (config.isComponentEnabled(Components.HIV_PROGRAM_LOCATION_WARNING)) {
+            enableHivProgramLocationWarning();
+        }
+
 
         if (config.isComponentEnabled(Components.RADIOLOGY)) {
             enableRadiology();
@@ -760,6 +764,7 @@ private void enableConsult() {
             }
         }
 
+
     private void enableConsultInitial() {
         extensions.add(visitAction(CustomAppLoaderConstants.Extensions.CONSULT_NOTE_INITIAL_VISIT_ACTION,
                 "ui.i18n.EncounterType.name." + PihEmrConfigConstants.ENCOUNTERTYPE_CONSULTATION_INITIAL_UUID,
@@ -864,6 +869,15 @@ private void enableADT() {
                 findExtensionById(CustomAppLoaderConstants.EncounterTemplates.NO_DETAILS), "fas fa-fw fa-sign-out-alt", null, true, null, null);
     }
 
+    private void enableHivProgramLocationWarning() {
+        extensions.add(fragmentExtension(CustomAppLoaderConstants.Extensions.HIV_PROGRAM_LOCATION_WARNING_HEADER_EXTENSION,
+                "pihcore",
+                "hiv/programLocationWarning",
+                null,
+                CustomAppLoaderConstants.ExtensionPoints.SECOND_LINE_HEADER,
+                null));
+
+    }
     private void enableDeathCertificate() {
 
         extensions.add(overallAction(CustomAppLoaderConstants.Extensions.DEATH_CERTIFICATE_OVERALL_ACTION,
diff --git a/omod/src/main/java/org/openmrs/module/pihcore/fragment/controller/hiv/ProgramLocationWarningFragmentController.java b/omod/src/main/java/org/openmrs/module/pihcore/fragment/controller/hiv/ProgramLocationWarningFragmentController.java
index 62a5c6d0f..cfbb1e31f 100644
--- a/omod/src/main/java/org/openmrs/module/pihcore/fragment/controller/hiv/ProgramLocationWarningFragmentController.java
+++ b/omod/src/main/java/org/openmrs/module/pihcore/fragment/controller/hiv/ProgramLocationWarningFragmentController.java
@@ -38,4 +38,7 @@ public void controller(FragmentModel model,
             }
         }
     }
-}
\ No newline at end of file
+
+}
+}
+
diff --git a/omod/src/main/webapp/fragments/hiv/programLocationWarning.gsp b/omod/src/main/webapp/fragments/hiv/programLocationWarning.gsp
index 64d9e93ef..ea62fbc55 100644
--- a/omod/src/main/webapp/fragments/hiv/programLocationWarning.gsp
+++ b/omod/src/main/webapp/fragments/hiv/programLocationWarning.gsp
@@ -1,4 +1,3 @@
-
 <div>
 <div id="hiv-program-location-info" style="background-color: lightcoral; padding: 10px; border-radius: 5px;">
       <ul>
@@ -12,4 +11,5 @@
       </ul>
 
 </div>
-</div>
\ No newline at end of file
+</div>
+