diff --git a/frontend/src/components/data/PatientResultsTableHeaders.js b/frontend/src/components/data/PatientResultsTableHeaders.js
index c1df7721e5..2088aad9d8 100644
--- a/frontend/src/components/data/PatientResultsTableHeaders.js
+++ b/frontend/src/components/data/PatientResultsTableHeaders.js
@@ -25,4 +25,8 @@ export const patientSearchHeaderData = [
     key: "nationalId",
     header: <FormattedMessage id="patient.natioanalid" />,
   },
+  {
+    key: "dataSourceName",
+    header: <FormattedMessage id="patient.dataSourceName" />,
+  },
 ];
diff --git a/frontend/src/components/patient/SearchPatientForm.js b/frontend/src/components/patient/SearchPatientForm.js
index bf0a176197..ead34f0207 100644
--- a/frontend/src/components/patient/SearchPatientForm.js
+++ b/frontend/src/components/patient/SearchPatientForm.js
@@ -1,7 +1,7 @@
 import React, { useContext, useState, useEffect } from "react";
 import { FormattedMessage, injectIntl, useIntl } from "react-intl";
 import "../Style.css";
-import { getFromOpenElisServer } from "../utils/Utils";
+import { getFromOpenElisServer, postToOpenElisServer } from "../utils/Utils";
 import {
   Form,
   TextInput,
@@ -20,7 +20,10 @@ import {
   TableCell,
   Pagination,
   Loading,
+  Toggle,
+  Tag,
 } from "@carbon/react";
+import { Person } from "@carbon/react/icons";
 import CustomLabNumberInput from "../common/CustomLabNumberInput";
 import { patientSearchHeaderData } from "../data/PatientResultsTableHeaders";
 import { Formik, Field } from "formik";
@@ -29,6 +32,7 @@ import { NotificationContext } from "../layout/Layout";
 import { AlertDialog, NotificationKinds } from "../common/CustomNotification";
 import CustomDatePicker from "../common/CustomDatePicker";
 import { ConfigurationContext } from "../layout/Layout";
+import CreatePatientFormValues from "../formModel/innitialValues/CreatePatientFormValues";
 
 function SearchPatientForm(props) {
   const { notificationVisible, setNotificationVisible, addNotification } =
@@ -39,20 +43,101 @@ function SearchPatientForm(props) {
 
   const [dob, setDob] = useState("");
   const [patientSearchResults, setPatientSearchResults] = useState([]);
+  const [importStatus, setImportStatus] = useState({});
   const [page, setPage] = useState(1);
   const [pageSize, setPageSize] = useState(5);
   const [loading, setLoading] = useState(false);
   const [nextPage, setNextPage] = useState(null);
+  const [isToggled, setIsToggled] = useState(false);
   const [previousPage, setPreviousPage] = useState(null);
   const [pagination, setPagination] = useState(false);
   const [url, setUrl] = useState("");
   const [searchFormValues, setSearchFormValues] = useState(
     SearchPatientFormValues,
   );
+
+  const handlePatientImport = (patientId) => {
+    console.log("Import button clicked, patientId:", patientId);
+
+    const patientSelected = patientSearchResults.find(
+      (patient) => patient.patientID === patientId,
+    );
+    console.log("Patient selected:", patientSelected);
+
+    if (!patientSelected) {
+      addNotification({
+        title: intl.formatMessage({ id: "notification.title" }),
+        message: intl.formatMessage({ id: "error.no.patient.data" }),
+        kind: NotificationKinds.error,
+      });
+      return;
+    }
+
+    const dataToSend = {
+      ...CreatePatientFormValues,
+      patientPK: "",
+      nationalId: patientSelected.nationalId || "",
+      subjectNumber: "",
+      lastName: patientSelected.lastName || "",
+      firstName: patientSelected.firstName || "",
+      streetAddress: patientSelected.address?.street || "",
+      city: patientSelected.address?.city || "",
+      primaryPhone: patientSelected.contactPhone || "",
+      gender: patientSelected.gender || "",
+      birthDateForDisplay: patientSelected.birthdate || "",
+      commune: patientSelected.commune || "",
+      education: patientSelected.education || "",
+      maritialStatus: patientSelected.maritalStatus || "",
+      nationality: patientSelected.nationality || "",
+      healthDistrict: patientSelected.healthDistrict || "",
+      healthRegion: patientSelected.healthRegion || "",
+      otherNationality: patientSelected.otherNationality || "",
+      patientContact: {
+        person: {
+          firstName: patientSelected.contact?.firstName || "",
+          lastName: patientSelected.contact?.lastName || "",
+          primaryPhone: patientSelected.contact?.primaryPhone || "",
+          email: patientSelected.contact?.email || "",
+        },
+      },
+    };
+
+    console.log("Data to send:", dataToSend);
+
+    postToOpenElisServer(
+      "/rest/patient-management",
+      JSON.stringify(dataToSend),
+      (status) => {
+        handlePost(status, patientId);
+      },
+    );
+  };
+
+  const handlePost = (status, patientId) => {
+    setNotificationVisible(true);
+    if (status === 200) {
+      addNotification({
+        title: intl.formatMessage({ id: "notification.title" }),
+        message: intl.formatMessage({ id: "success.import.patient" }),
+        kind: NotificationKinds.success,
+      });
+      setImportStatus((prevStatus) => ({
+        ...prevStatus,
+        [patientId]: true,
+      }));
+    } else {
+      addNotification({
+        title: intl.formatMessage({ id: "notification.title" }),
+        message: intl.formatMessage({ id: "error.import.patient" }),
+        kind: NotificationKinds.error,
+      });
+    }
+  };
+
   const handleSubmit = (values) => {
     setLoading(true);
     values.dateOfBirth = dob;
-    const searchEndPoint =
+    let searchEndPoint =
       "/rest/patient-search-results?" +
       "lastName=" +
       values.lastName +
@@ -74,9 +159,15 @@ function SearchPatientForm(props) {
       values.gender +
       "&suppressExternalSearch=" +
       values.suppressExternalSearch;
+
+    if (values.crSearch === true) {
+      searchEndPoint += "&crSearch=true";
+    }
+
     getFromOpenElisServer(searchEndPoint, fetchPatientResults);
     setUrl(searchEndPoint);
   };
+
   const loadNextResultsPage = () => {
     setLoading(true);
     getFromOpenElisServer(url + "&page=" + nextPage, fetchPatientResults);
@@ -87,6 +178,10 @@ function SearchPatientForm(props) {
     getFromOpenElisServer(url + "&page=" + previousPage, fetchPatientResults);
   };
 
+  const toggle = () => {
+    setIsToggled((prev) => !prev);
+  };
+
   const fetchPatientResults = (res) => {
     let patientsResults = res.patientSearchResults;
     if (patientsResults.length > 0) {
@@ -351,6 +446,21 @@ function SearchPatientForm(props) {
                   />
                 </Button>
               </Column>
+              {configurationProperties.ENABLE_CLIENT_REGISTRY === "true" && (
+                <Column lg={4} md={4} sm={2}>
+                  <Toggle
+                    labelText="Client Registry Search"
+                    labelA="false"
+                    labelB="true"
+                    id="toggle-cr"
+                    toggled={isToggled}
+                    onClick={() => {
+                      toggle();
+                      setFieldValue("crSearch", !isToggled);
+                    }}
+                  />
+                </Column>
+              )}
             </Grid>
           </Form>
         )}
@@ -396,7 +506,7 @@ function SearchPatientForm(props) {
             <Table {...getTableProps()}>
               <TableHead>
                 <TableRow>
-                  <TableHeader></TableHeader>
+                  <TableHeader />
                   {headers.map((header) => (
                     <TableHeader
                       key={header.key}
@@ -408,27 +518,74 @@ function SearchPatientForm(props) {
                 </TableRow>
               </TableHead>
               <TableBody>
-                <>
-                  {rows
-                    .slice((page - 1) * pageSize)
-                    .slice(0, pageSize)
-                    .map((row) => (
+                {rows
+                  .slice((page - 1) * pageSize, page * pageSize)
+                  .map((row) => {
+                    const dataSourceName = row.cells.find(
+                      (cell) => cell.info.header === "dataSourceName",
+                    )?.value;
+
+                    return (
                       <TableRow key={row.id}>
                         <TableCell>
-                          {" "}
-                          <RadioButton
-                            name="radio-group"
-                            onClick={patientSelected}
-                            labelText=""
-                            id={row.id}
-                          />
+                          {dataSourceName === "OpenElis" ? (
+                            <RadioButton
+                              name="radio-group"
+                              onClick={patientSelected}
+                              labelText=""
+                              id={row.id}
+                            />
+                          ) : (
+                            <span></span>
+                          )}
                         </TableCell>
+
                         {row.cells.map((cell) => (
-                          <TableCell key={cell.id}>{cell.value}</TableCell>
+                          <TableCell key={cell.id}>
+                            {cell.info.header === "dataSourceName" ? (
+                              <>
+                                <Tag
+                                  type={
+                                    cell.value === "OpenElis"
+                                      ? "red"
+                                      : cell.value === "Open Client Registry"
+                                        ? "green"
+                                        : "gray"
+                                  }
+                                >
+                                  {cell.value}
+                                </Tag>
+                                &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp;
+                                {dataSourceName === "Open Client Registry" ? (
+                                  <Button
+                                    id={row.id}
+                                    kind="tertiary"
+                                    onClick={() => handlePatientImport(row.id)}
+                                    size="md"
+                                    disabled={importStatus[row.id]}
+                                  >
+                                    <Person size={16} />
+                                    {importStatus[row.id] ? (
+                                      <span>
+                                        &nbsp;&nbsp;Patient Imported
+                                        Successfully
+                                      </span>
+                                    ) : (
+                                      <span>&nbsp;&nbsp;Import Patient</span>
+                                    )}
+                                  </Button>
+                                ) : (
+                                  <span></span>
+                                )}
+                              </>
+                            ) : (
+                              cell.value
+                            )}
+                          </TableCell>
                         ))}
                       </TableRow>
-                    ))}
-                </>
+                    );
+                  })}
               </TableBody>
             </Table>
           </TableContainer>
diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
index b018fe2acf..2adf53a837 100644
--- a/frontend/src/languages/en.json
+++ b/frontend/src/languages/en.json
@@ -541,6 +541,7 @@
   "search.label.sample": "Select Sample Status",
   "pathology.label.report": "Pathology Report",
   "patient.natioanalid": "National ID",
+  "patient.dataSourceName": "Data Source Name",
   "patient.label.additionalInfo": "Additional Information",
   "sample.entry.available.tests": "Available Tests",
   "sample.entry.panels": "Panels",
@@ -828,6 +829,9 @@
   "rulebuilder.label.add.externaltrigger": "Add External `triggered by` message",
   "error.duplicate.calculationname": "Duplicate Calculation Name or Error while saving",
   "success.save.patient": "Patient Saved Successfully",
+  "success.import.patient": "Patient Succesfully Imported",
+  "error.no.patient.data": "No Patient Data to Import",
+  "error.import.patient": "Error While Importing Patient into OpenELIS",
   "error.save.patient": "Error While Saving Patient",
   "patient.search.nopatient": "No patients found matching search terms",
   "result.search.noresult": "No results found",
diff --git a/pom.xml b/pom.xml
index d7db495d4a..cc626cf0d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -664,6 +664,7 @@
                 <exclude>tools/Liquibase-Outdated/**</exclude>
                 <exclude>dataexport/**</exclude>
                 <exclude>plugins/**</exclude>
+                <exclude>frontend/**</exclude>
               </excludes>
               <prettier>
                 <!-- Formatter that Spotless supports and can format Markdown:
diff --git a/src/main/java/org/openelisglobal/common/provider/query/PatientSearchResultsForm.java b/src/main/java/org/openelisglobal/common/provider/query/PatientSearchResultsForm.java
index b39bbe8448..c87a643861 100644
--- a/src/main/java/org/openelisglobal/common/provider/query/PatientSearchResultsForm.java
+++ b/src/main/java/org/openelisglobal/common/provider/query/PatientSearchResultsForm.java
@@ -1,6 +1,8 @@
 package org.openelisglobal.common.provider.query;
 
 import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
 import org.openelisglobal.common.form.IPagingForm;
 import org.openelisglobal.common.paging.PagingBean;
 
@@ -8,16 +10,10 @@ public class PatientSearchResultsForm implements IPagingForm {
 
     private PagingBean paging;
 
+    @Getter
+    @Setter
     private List<PatientSearchResults> patientSearchResults;
 
-    public List<PatientSearchResults> getPatientSearchResults() {
-        return patientSearchResults;
-    }
-
-    public void setPatientSearchResults(List<PatientSearchResults> patientSearchResults) {
-        this.patientSearchResults = patientSearchResults;
-    }
-
     @Override
     public void setPaging(PagingBean pagingBean) {
         this.paging = pagingBean;
diff --git a/src/main/java/org/openelisglobal/common/rest/DisplayListController.java b/src/main/java/org/openelisglobal/common/rest/DisplayListController.java
index 941ef8f214..cc763646e7 100644
--- a/src/main/java/org/openelisglobal/common/rest/DisplayListController.java
+++ b/src/main/java/org/openelisglobal/common/rest/DisplayListController.java
@@ -367,6 +367,8 @@ private Map<String, String> getOpenConfigurationProperties() {
                 ConfigurationProperties.getInstance().getPropertyValue(Property.configurationName));
         configs.put(Property.REQUIRE_LAB_UNIT_AT_LOGIN.toString(),
                 ConfigurationProperties.getInstance().getPropertyValue(Property.REQUIRE_LAB_UNIT_AT_LOGIN));
+        configs.put(Property.ENABLE_CLIENT_REGISTRY.toString(),
+                ConfigurationProperties.getInstance().getPropertyValue(Property.ENABLE_CLIENT_REGISTRY));
         return configs;
     }
 
diff --git a/src/main/java/org/openelisglobal/common/rest/provider/PatientSearchRestController.java b/src/main/java/org/openelisglobal/common/rest/provider/PatientSearchRestController.java
index 22b1ec4b9c..52d02541dc 100644
--- a/src/main/java/org/openelisglobal/common/rest/provider/PatientSearchRestController.java
+++ b/src/main/java/org/openelisglobal/common/rest/provider/PatientSearchRestController.java
@@ -1,11 +1,19 @@
 package org.openelisglobal.common.rest.provider;
 
+import ca.uhn.fhir.rest.client.api.IGenericClient;
+import ca.uhn.fhir.rest.gclient.IQuery;
+import ca.uhn.fhir.rest.param.StringOrListParam;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.validator.GenericValidator;
+import org.hl7.fhir.instance.model.api.IBaseBundle;
+import org.hl7.fhir.r4.model.*;
+import org.openelisglobal.common.log.LogEvent;
 import org.openelisglobal.common.provider.query.PatientSearchResults;
 import org.openelisglobal.common.provider.query.PatientSearchResultsForm;
 import org.openelisglobal.common.provider.query.workerObjects.PatientSearchLocalAndExternalWorker;
@@ -15,6 +23,9 @@
 import org.openelisglobal.common.rest.util.PatientSearchResultsPaging;
 import org.openelisglobal.common.util.ConfigurationProperties;
 import org.openelisglobal.common.util.ConfigurationProperties.Property;
+import org.openelisglobal.dataexchange.fhir.FhirConfig;
+import org.openelisglobal.dataexchange.fhir.FhirUtil;
+import org.openelisglobal.dataexchange.fhir.service.FhirTransformService;
 import org.openelisglobal.internationalization.MessageUtil;
 import org.openelisglobal.observationhistory.service.ObservationHistoryService;
 import org.openelisglobal.observationhistory.service.ObservationHistoryServiceImpl.ObservationType;
@@ -25,6 +36,9 @@
 import org.openelisglobal.sample.valueholder.Sample;
 import org.openelisglobal.samplehuman.service.SampleHumanService;
 import org.openelisglobal.search.service.SearchResultsService;
+import org.openelisglobal.spring.util.SpringContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
@@ -37,6 +51,10 @@
 @RequestMapping(value = "/rest/")
 public class PatientSearchRestController extends BaseRestController {
 
+    @Autowired
+    private FhirConfig fhirConfig;
+    @Autowired
+    private FhirUtil fhirUtil;
     @Autowired
     SampleService sampleService;
     @Autowired
@@ -50,6 +68,10 @@ public class PatientSearchRestController extends BaseRestController {
     @Autowired
     SearchResultsService searchResultsService;
 
+    StringOrListParam targetSystemsParam;
+
+    private static final Logger log = LoggerFactory.getLogger(PatientSearchRestController.class);
+
     @GetMapping(value = "patient-search-results", produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody
     public PatientSearchResultsForm getPatientResults(HttpServletRequest request,
@@ -86,6 +108,18 @@ public PatientSearchResultsForm getPatientResults(HttpServletRequest request,
                     return form;
                 }
             }
+
+            if (ConfigurationProperties.getInstance().getPropertyValue(Property.ENABLE_CLIENT_REGISTRY)
+                    .equals("true")) {
+                String crSearchParam = request.getParameter("crSearch");
+                if (crSearchParam != null && crSearchParam.contains("true")) {
+                    List<PatientSearchResults> fhirResults = searchPatientInClientRegistry(lastName, firstName,
+                            STNumber, subjectNumber, nationalID, null, guid, dateOfBirth, gender);
+                    LogEvent.logWarn("PatientSearchRestController", "getPatientResults()",
+                            "final results have been added");
+                    results = fhirResults;
+                }
+            }
             paging.setDatabaseResults(request, form, results);
         } else {
             int requestedPageNumber = Integer.parseInt(requestedPage);
@@ -138,4 +172,165 @@ private PatientSearchWorker getAppropriateWorker(HttpServletRequest request, boo
                 externalID, patientID, guid, dateOfBirth, gender);
     }
 
+    private List<PatientSearchResults> searchPatientInClientRegistry(String lastName, String firstName, String STNumber,
+            String subjectNumber, String nationalID, String patientID, String guid, String dateOfBirth, String gender) {
+        LogEvent.logWarn("PatientSearchRestController", "searchPatientInClientRegistry()",
+                "searchPatientInClientRegistry method has been reached");
+        if (isClientRegistryConfigInvalid()) {
+            return new ArrayList<>();
+        }
+
+        IGenericClient clientRegistry = fhirUtil.getFhirClient(fhirConfig.getClientRegistryServerUrl(),
+                fhirConfig.getClientRegistryUserName(), fhirConfig.getClientRegistryPassword());
+        LogEvent.logWarn("PatientSearchRestController", "searchPatientInClientRegistry()",
+                "ClientRegistry connected successfully");
+
+        IQuery<IBaseBundle> query = buildPatientSearchQuery(clientRegistry, lastName, firstName, STNumber,
+                subjectNumber, nationalID, patientID, guid, dateOfBirth, gender);
+
+        Bundle bundle = query.returnBundle(Bundle.class).execute();
+        List<org.hl7.fhir.r4.model.Patient> externalPatients = new ArrayList<>();
+        if (bundle.hasEntry()) {
+            for (Bundle.BundleEntryComponent entry : bundle.getEntry()) {
+                if (entry.getResource() instanceof org.hl7.fhir.r4.model.Patient) {
+                    externalPatients.add((org.hl7.fhir.r4.model.Patient) entry.getResource());
+                    LogEvent.logWarn("PatientSearchRestController", "searchPatientInClientRegistry()",
+                            "externalPatients have been added");
+                }
+            }
+        }
+
+        List<PatientSearchResults> finalResults = new ArrayList<>();
+        for (org.hl7.fhir.r4.model.Patient externalPatient : externalPatients) {
+            // convert fhir object to patient search result
+            PatientSearchResults transformedPatientSearchResult = SpringContext.getBean(FhirTransformService.class)
+                    .transformToOpenElisPatientSearchResults(externalPatient);
+            // in case the patient object has no NationalId ,
+            // we can construct a dynamic National ID like "NID-{gender}-{dob}-{initials}"
+            if (transformedPatientSearchResult.getNationalId() == null
+                    || transformedPatientSearchResult.getNationalId().isEmpty()) {
+                String nationalId = generateDynamicID(transformedPatientSearchResult);
+                log.info("dynamic national id: {}", nationalId);
+                transformedPatientSearchResult.setNationalId(nationalId);
+            }
+
+            transformedPatientSearchResult.setDataSourceName(MessageUtil.getMessage("patient.cr.source"));
+            finalResults.add(transformedPatientSearchResult);
+        }
+
+        return finalResults;
+    }
+
+    // FIXME: get better fallback initials and gender
+    private static String generateDynamicID(PatientSearchResults transformedPatientSearchResult) {
+        String genderOfTransformedPatient = transformedPatientSearchResult.getGender() != null
+                && !transformedPatientSearchResult.getGender().isEmpty()
+                        ? transformedPatientSearchResult.getGender().toUpperCase()
+                        : "UNK";
+
+        String initials = getInitials(transformedPatientSearchResult);
+
+        String formattedDob = "00000000";
+        if (transformedPatientSearchResult.getBirthdate() != null
+                && !transformedPatientSearchResult.getBirthdate().isEmpty()) {
+            try {
+                // Try to parse with "dd/MM/yyyy" format first
+                DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("dd/MM/yyyy");
+                LocalDate birthdate = LocalDate.parse(transformedPatientSearchResult.getBirthdate(), dateFormatter);
+                formattedDob = birthdate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+            } catch (DateTimeParseException e1) {
+                try {
+                    LocalDate birthdate = LocalDate.parse(transformedPatientSearchResult.getBirthdate(),
+                            DateTimeFormatter.ISO_DATE);
+                    formattedDob = birthdate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+                } catch (DateTimeParseException e2) {
+                    LogEvent.logError(e2);
+                }
+            }
+        }
+
+        return String.format("NID-%s-%s-%s", genderOfTransformedPatient, formattedDob, initials);
+    }
+
+    private static String getInitials(PatientSearchResults transformedPatientSearchResult) {
+        String initials = "";
+        if (transformedPatientSearchResult.getFirstName() != null
+                && !transformedPatientSearchResult.getFirstName().isEmpty()) {
+            initials = transformedPatientSearchResult.getFirstName().substring(0, 1).toUpperCase();
+        }
+        if (transformedPatientSearchResult.getLastName() != null
+                && !transformedPatientSearchResult.getLastName().isEmpty()) {
+            initials += transformedPatientSearchResult.getLastName().substring(0, 1).toUpperCase();
+        }
+
+        if (initials.isEmpty()) {
+            initials = "NAN";
+        }
+        return initials;
+    }
+
+    private boolean isClientRegistryConfigInvalid() {
+        return GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryServerUrl())
+                || GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryUserName())
+                || GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryPassword());
+    }
+
+    public IQuery<IBaseBundle> buildPatientSearchQuery(IGenericClient clientRegistry, String lastName, String firstName,
+            String STNumber, String subjectNumber, String nationalID, String patientID, String guid, String dateOfBirth,
+            String gender) {
+        IQuery<IBaseBundle> query = clientRegistry.search().forResource(org.hl7.fhir.r4.model.Patient.class);
+        if (!GenericValidator.isBlankOrNull(lastName)) {
+            query = query.where(org.hl7.fhir.r4.model.Patient.FAMILY.matches().value(lastName));
+            LogEvent.logWarn("PatientSearchRestController", "buildPatientSearchQuery()", "lastname added to query");
+        }
+
+        if (!GenericValidator.isBlankOrNull(firstName)) {
+            query = query.where(org.hl7.fhir.r4.model.Patient.GIVEN.matches().value(firstName));
+            LogEvent.logWarn("PatientSearchRestController", "buildPatientSearchQuery()", "first name added to query");
+        }
+
+        // Map for identifier-based queries (STNumber, SubjectNumber, NationalId,
+        // PatientID, GUID)
+        Map<String, String> identifierMappings = new HashMap<>();
+
+        // Add non-null identifiers to the map
+        if (STNumber != null) {
+            identifierMappings.put("stnumber", STNumber);
+        }
+        if (subjectNumber != null) {
+            identifierMappings.put("subjectnumber", subjectNumber);
+        }
+        if (nationalID != null) {
+            identifierMappings.put("nationalid", nationalID);
+        }
+        if (patientID != null) {
+            identifierMappings.put("patientid", patientID);
+        }
+        if (guid != null) {
+            identifierMappings.put("guid", guid);
+        }
+
+        // Loop through identifiers and add them to the query
+        for (Map.Entry<String, String> entry : identifierMappings.entrySet()) {
+            String value = entry.getValue();
+            if (!GenericValidator.isBlankOrNull(value)) {
+                query = query.where(org.hl7.fhir.r4.model.Patient.IDENTIFIER.exactly()
+                        .systemAndCode("http://openelis-global.org/pat_" + entry.getKey(), value));
+                LogEvent.logInfo("PatientSearchRestController", "buildPatientSearchQuery()",
+                        "Added identifier (" + entry.getKey() + ") to query.");
+            }
+        }
+
+        if (!GenericValidator.isBlankOrNull(dateOfBirth)) {
+            query = query.where(org.hl7.fhir.r4.model.Patient.BIRTHDATE.exactly().day(dateOfBirth));
+            LogEvent.logWarn("PatientSearchRestController", "buildPatientSearchQuery()", "dob added to query");
+        }
+
+        if (!GenericValidator.isBlankOrNull(gender)) {
+            query = query.where(org.hl7.fhir.r4.model.Patient.GENDER.exactly().code(gender));
+            LogEvent.logWarn("PatientSearchRestController", "buildPatientSearchQuery()", "gender added to query");
+        }
+
+        return query;
+    }
 }
diff --git a/src/main/java/org/openelisglobal/common/util/ConfigurationProperties.java b/src/main/java/org/openelisglobal/common/util/ConfigurationProperties.java
index b4c9d6b6d9..fba4442642 100644
--- a/src/main/java/org/openelisglobal/common/util/ConfigurationProperties.java
+++ b/src/main/java/org/openelisglobal/common/util/ConfigurationProperties.java
@@ -196,7 +196,9 @@ public enum Property {
         PATIENT_RESULTS_SMTP_ADDRESS("patientresultssmtp.uri"), //
         PATIENT_RESULTS_SMTP_ENABLED("patientresultssmtp.enabled"), //
         CONTACT_TRACING("contactTracingEnabled"), //
-        REQUIRE_LAB_UNIT_AT_LOGIN("requireLabUnitAtLogin");
+        REQUIRE_LAB_UNIT_AT_LOGIN("requireLabUnitAtLogin"), //
+        ENABLE_CLIENT_REGISTRY("enableClientRegistry"); // if true, then client registry search option is visible on
+                                                        // the ui
 
         private String name;
 
diff --git a/src/main/java/org/openelisglobal/common/util/DefaultConfigurationProperties.java b/src/main/java/org/openelisglobal/common/util/DefaultConfigurationProperties.java
index 7e6e9c648b..b447a45785 100644
--- a/src/main/java/org/openelisglobal/common/util/DefaultConfigurationProperties.java
+++ b/src/main/java/org/openelisglobal/common/util/DefaultConfigurationProperties.java
@@ -214,6 +214,8 @@ public class DefaultConfigurationProperties extends ConfigurationProperties {
                 Property.USE_ALPHANUM_ACCESSION_PREFIX.getName(), "false");
         setDBPropertyMappingAndDefault(Property.REQUIRE_LAB_UNIT_AT_LOGIN, Property.REQUIRE_LAB_UNIT_AT_LOGIN.getName(),
                 "false");
+        setDBPropertyMappingAndDefault(Property.ENABLE_CLIENT_REGISTRY, Property.ENABLE_CLIENT_REGISTRY.getName(),
+                "false");
     }
 
     private void setDBPropertyMappingAndDefault(Property property, String dbName, String defaultValue) {
diff --git a/src/main/java/org/openelisglobal/dataexchange/fhir/FhirConfig.java b/src/main/java/org/openelisglobal/dataexchange/fhir/FhirConfig.java
index bc97384b71..d4a7aab6de 100644
--- a/src/main/java/org/openelisglobal/dataexchange/fhir/FhirConfig.java
+++ b/src/main/java/org/openelisglobal/dataexchange/fhir/FhirConfig.java
@@ -10,6 +10,7 @@
 import ca.uhn.fhir.rest.client.interceptor.BasicAuthInterceptor;
 import java.util.ArrayList;
 import java.util.List;
+import lombok.Getter;
 import org.apache.commons.validator.GenericValidator;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
@@ -25,31 +26,44 @@
 @Configuration
 public class FhirConfig {
 
+    @Getter
     @Value("${org.openelisglobal.oe.fhir.system:http://openelis-global.org}")
     private String oeFhirSystem;
 
+    @Getter
     @Value("${org.openelisglobal.fhirstore.uri}")
     private String localFhirStorePath;
 
+    @Getter
     @Value("${org.openelisglobal.remote.source.uri}")
     private String[] remoteStorePaths;
 
+    @Getter
     @Value("${org.openelisglobal.fhirstore.username:}")
     private String username;
 
+    @Getter
     @Value("${org.openelisglobal.fhirstore.password:}")
     private String password;
 
+    @Getter
+    @Value("${org.openelisglobal.crserver.uri}")
+    private String clientRegistryServerUrl;
+
+    @Getter
+    @Value("${org.openelisglobal.crserver.username}")
+    private String clientRegistryUserName;
+
+    @Getter
+    @Value("${org.openelisglobal.crserver.password}")
+    private String clientRegistryPassword;
+
     @Value("${org.openelisglobal.remote.source.identifier:}#{T(java.util.Collections).emptyList()}")
     private List<String> remoteStoreIdentifier;
 
     @Autowired
     CloseableHttpClient httpClient;
 
-    public String getLocalFhirStorePath() {
-        return localFhirStorePath;
-    }
-
     @Bean
     public FhirContext fhirContext() {
         FhirContext fhirContext = new FhirContext(FhirVersionEnum.R4);
@@ -64,22 +78,6 @@ public void configureFhirHttpClient(FhirContext fhirContext) {
         fhirContext.setRestfulClientFactory(clientFactory);
     }
 
-    public String getOeFhirSystem() {
-        return oeFhirSystem;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public String[] getRemoteStorePaths() {
-        return remoteStorePaths;
-    }
-
     public List<String> getRemoteStoreIdentifier() {
 
         if (remoteStoreIdentifier.contains(ResourceType.Practitioner + "/*")) {
diff --git a/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirTransformService.java b/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirTransformService.java
index 428894bc13..79aabf8e78 100644
--- a/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirTransformService.java
+++ b/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirTransformService.java
@@ -10,6 +10,7 @@
 import org.hl7.fhir.r4.model.Resource;
 import org.hl7.fhir.r4.model.ResourceType;
 import org.openelisglobal.analysis.valueholder.Analysis;
+import org.openelisglobal.common.provider.query.PatientSearchResults;
 import org.openelisglobal.dataexchange.fhir.exception.FhirLocalPersistingException;
 import org.openelisglobal.dataexchange.fhir.exception.FhirPersistanceException;
 import org.openelisglobal.dataexchange.fhir.exception.FhirTransformationException;
@@ -70,4 +71,6 @@ void transformPersistResultValidationFhirObjects(List<Result> deletableList, Lis
     Practitioner transformProviderToPractitioner(Provider provider);
 
     Provider transformToProvider(Practitioner practitioner);
+
+    PatientSearchResults transformToOpenElisPatientSearchResults(org.hl7.fhir.r4.model.Patient externalPatient);
 }
diff --git a/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirTransformServiceImpl.java b/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirTransformServiceImpl.java
index 0d19efcc22..e1293da7ad 100644
--- a/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirTransformServiceImpl.java
+++ b/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirTransformServiceImpl.java
@@ -63,11 +63,14 @@
 import org.openelisglobal.analysis.valueholder.Analysis;
 import org.openelisglobal.common.action.IActionConstants;
 import org.openelisglobal.common.log.LogEvent;
+import org.openelisglobal.common.provider.query.PatientSearchResults;
 import org.openelisglobal.common.services.IStatusService;
 import org.openelisglobal.common.services.SampleAddService.SampleTestCollection;
 import org.openelisglobal.common.services.StatusService.AnalysisStatus;
 import org.openelisglobal.common.services.StatusService.OrderStatus;
 import org.openelisglobal.common.services.TableIdService;
+import org.openelisglobal.common.util.ConfigurationProperties;
+import org.openelisglobal.common.util.ConfigurationProperties.Property;
 import org.openelisglobal.common.util.DateUtil;
 import org.openelisglobal.common.util.validator.GenericValidator;
 import org.openelisglobal.dataexchange.fhir.FhirConfig;
@@ -115,7 +118,6 @@
 import org.openelisglobal.typeofsample.valueholder.TypeOfSample;
 import org.openelisglobal.typeoftestresult.service.TypeOfTestResultServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncResult;
 import org.springframework.stereotype.Service;
@@ -124,13 +126,6 @@
 @Service
 public class FhirTransformServiceImpl implements FhirTransformService {
 
-    @Value("${org.openelisglobal.crserver.uri:}")
-    private String clientRegistryServerUrl;
-    @Value("${org.openelisglobal.crserver.username:}")
-    private String clientRegistryUserName;
-    @Value("${org.openelisglobal.crserver.password:}")
-    private String clientRegistryPassword;
-
     @Autowired
     private FhirConfig fhirConfig;
     @Autowired
@@ -173,7 +168,6 @@ public class FhirTransformServiceImpl implements FhirTransformService {
     private AddressPartService addressPartService;
     @Autowired
     private OrganizationService organizationService;
-
     @Autowired
     private FhirUtil fhirUtil;
 
@@ -396,21 +390,23 @@ public void transformPersistPatient(PatientManagementInfo patientInfo, boolean i
         org.hl7.fhir.r4.model.Patient patient = transformToFhirPatient(patientInfo.getPatientPK());
         this.addToOperations(fhirOperations, tempIdGenerator, patient);
 
-        if (!GenericValidator.isBlankOrNull(clientRegistryServerUrl)
-                && !GenericValidator.isBlankOrNull(clientRegistryUserName)
-                && !GenericValidator.isBlankOrNull(clientRegistryPassword)) {
-            IGenericClient clientRegistry = fhirUtil.getFhirClient(clientRegistryServerUrl, clientRegistryUserName,
-                    clientRegistryPassword);
-            try {
-                if (isCreate) {
-                    clientRegistry.create().resource(patient).execute();
-                } else {
-                    clientRegistry.update().resource(patient).execute();
+        if (ConfigurationProperties.getInstance().getPropertyValue(Property.ENABLE_CLIENT_REGISTRY).equals("true")) {
+            if (!GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryServerUrl())
+                    && !GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryUserName())
+                    && !GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryPassword())) {
+                IGenericClient clientRegistry = fhirUtil.getFhirClient(fhirConfig.getClientRegistryServerUrl(),
+                        fhirConfig.getClientRegistryUserName(), fhirConfig.getClientRegistryPassword());
+                try {
+                    if (isCreate) {
+                        clientRegistry.create().resource(patient).execute();
+                    } else {
+                        clientRegistry.update().resource(patient).execute();
+                    }
+                } catch (FhirClientConnectionException e) {
+                    handleException(e, patientInfo.getPatientUpdateStatus());
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
                 }
-            } catch (FhirClientConnectionException e) {
-                handleException(e, patientInfo.getPatientUpdateStatus());
-            } catch (Exception e) {
-                throw new RuntimeException(e);
             }
         }
 
@@ -697,6 +693,64 @@ private org.hl7.fhir.r4.model.Patient transformToFhirPatient(Patient patient) {
         return fhirPatient;
     }
 
+    @Override
+    public PatientSearchResults transformToOpenElisPatientSearchResults(org.hl7.fhir.r4.model.Patient fhirPatient) {
+        PatientSearchResults patientSearchResults = new PatientSearchResults();
+
+        if (fhirPatient.hasId()) {
+            patientSearchResults.setPatientID(fhirPatient.getIdElement().getIdPart());
+        }
+
+        for (Identifier identifier : fhirPatient.getIdentifier()) {
+            String system = identifier.getSystem();
+            String value = identifier.getValue();
+
+            if ("http://openelis-global.org/pat_nationalId".equals(system)) {
+                patientSearchResults.setNationalId(value);
+            } else if ("http://openelis-global.org/pat_guid".equals(system)) {
+                patientSearchResults.setExternalId(value);
+            } else if ("http://openelis-global.org/pat_uuid".equals(system)) {
+                patientSearchResults.setGUID(value);
+            }
+        }
+
+        if (!fhirPatient.getName().isEmpty()) {
+            HumanName name = fhirPatient.getNameFirstRep();
+            patientSearchResults.setFirstName(name.getGivenAsSingleString());
+            patientSearchResults.setLastName(name.getFamily());
+        }
+
+        switch (fhirPatient.getGender()) {
+        case MALE:
+            patientSearchResults.setGender("M");
+            break;
+        case FEMALE:
+            patientSearchResults.setGender("F");
+            break;
+        default:
+            patientSearchResults.setGender(null);
+            break;
+        }
+
+        if (fhirPatient.getBirthDate() != null) {
+            patientSearchResults.setBirthdate(
+                    DateUtil.convertTimestampToStringDate(new Timestamp(fhirPatient.getBirthDate().getTime())));
+        }
+
+        if (!fhirPatient.getTelecom().isEmpty()) {
+            ContactPoint telecom = fhirPatient.getTelecomFirstRep();
+            if (ContactPointSystem.PHONE.equals(telecom.getSystem())) {
+                patientSearchResults.setContactPhone(telecom.getValue());
+            }
+
+            if (ContactPointSystem.EMAIL.equals(telecom.getSystem())) {
+                patientSearchResults.setContactEmail(telecom.getValue());
+            }
+        }
+
+        return patientSearchResults;
+    }
+
     private Address transformToAddress(Person person) {
         @SuppressWarnings("unused")
         PersonAddress village = null;
diff --git a/src/main/resources/languages/message_en.properties b/src/main/resources/languages/message_en.properties
index e295993aab..88b329f39e 100644
--- a/src/main/resources/languages/message_en.properties
+++ b/src/main/resources/languages/message_en.properties
@@ -4149,6 +4149,7 @@ patient.information                                 = Patient Information
 patient.insuranceNumber                             = Insurance number
 patient.labno.search                                = Lab No
 patient.local.source                                = OpenElis
+patient.cr.source                                   = Open Client Registry
 patient.management.title                            = Add/Modify Patient
 patient.maritialStatus                              = Marital Status
 patient.medicaidId                                  = Medicaid
diff --git a/src/main/resources/liquibase/2.8.x.x/base.xml b/src/main/resources/liquibase/2.8.x.x/base.xml
index bc8fd6bb34..fbce73441b 100644
--- a/src/main/resources/liquibase/2.8.x.x/base.xml
+++ b/src/main/resources/liquibase/2.8.x.x/base.xml
@@ -23,4 +23,5 @@
   <include relativeToChangelogFile="true" file="notification_subscriptions.xml" />
   <include relativeToChangelogFile="true" file="method.xml" />
   <include relativeToChangelogFile="true" file="landing_page_config.xml" />
+  <include relativeToChangelogFile="true" file="enable_client_registry_search.xml" />
 </databaseChangeLog>
diff --git a/src/main/resources/liquibase/2.8.x.x/enable_client_registry_search.xml b/src/main/resources/liquibase/2.8.x.x/enable_client_registry_search.xml
new file mode 100644
index 0000000000..0691ca4adf
--- /dev/null
+++ b/src/main/resources/liquibase/2.8.x.x/enable_client_registry_search.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+     http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
+    <property name="now" value="now()" dbms="postgresql"/>
+
+    <changeSet author="mherman22" id="1">
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="0">select count(*) from clinlims.site_information where name = 'enableClientRegistry'; </sqlCheck>
+        </preConditions>
+        <comment>add Config to enable client registry search</comment>
+        <insert schemaName="clinlims" tableName="site_information">
+            <column name="id" valueSequenceNext="site_information_seq" />
+            <column name="name" value="enableClientRegistry" />
+            <column name="lastupdated" valueComputed="${now}" />
+            <column name="description" value="Enable Client Registry Search" />
+            <column name="encrypted" value="false" />
+            <column name="domain_id" valueComputed="(SELECT id FROM site_information_domain WHERE name = 'siteIdentity')" />
+            <column name="value_type" value="boolean" />
+            <column name="value" value="false" />
+            <column name="group" value="0" />
+        </insert>
+    </changeSet>
+</databaseChangeLog>