diff --git a/ui/app/i18n/registration/locale_en.json b/ui/app/i18n/registration/locale_en.json
index 69527d6bf..f970669ab 100644
--- a/ui/app/i18n/registration/locale_en.json
+++ b/ui/app/i18n/registration/locale_en.json
@@ -51,13 +51,19 @@
   "REGISTRATION_LABEL_VALID_PATIENT_IDENTIFIER":"Please enter a valid patient identifier",
   "REGISTRATION_LABEL_PROVIDER_AUTOCOMPLETE_LIST":"Please select a provider from the autocomplete list",
   "REGISTRATION_LABEL_PATIENT_AUTOCOMPLETE_LIST":"Please select a patient from the autocomplete list",
-  "REGISTRATION_LABEL_ENTER_NAME":"Enter Name",
+  "REGISTRATION_LABEL_ENTER_NAME":"Enter First Name",
+  "REGISTRATION_LABEL_ENTER_LAST_NAME":"Enter Last Name",
   "REGISTRATION_LABEL_PERSON_NOT_FOUND":"Person not found",
   "REGISTRATION_LABEL_PATIENT_ID":"ID",
   "REGISTRATION_LABEL_PATIENT_ID_HIE":"ECID",
   "REGISTRATION_LABEL_SEARCH":"Search",
+<<<<<<< HEAD
+  "REGISTRATION_LABEL_NAME":"First Name",
+  "REGISTRATION_LABEL_LAST_NAME":"Last Name",
+=======
   "REGISTRATION_LABEL_SEARCH_HIE":"HIE Search",
   "REGISTRATION_LABEL_NAME":"Name",
+>>>>>>> 5dd1c5ca0ab8dd8d520c13ccf946b565a324a4fc
   "REGISTRATION_LABEL_ID":"ID",
   
   "REGISTRATION_LABEL_NO_RESULTS":"No more results",
diff --git a/ui/app/registration/controllers/searchPatientController.js b/ui/app/registration/controllers/searchPatientController.js
index 4b7b0a1bb..00335d75b 100644
--- a/ui/app/registration/controllers/searchPatientController.js
+++ b/ui/app/registration/controllers/searchPatientController.js
@@ -57,6 +57,7 @@ angular.module('bahmni.registration')
 
             var hasSearchParameters = function () {
                 return $scope.searchParameters.name.trim().length > 0 ||
+                    $scope.searchParameters.last_name.trim().length > 0 ||
                     $scope.searchParameters.addressFieldValue.trim().length > 0 ||
                     $scope.searchParameters.customAttribute.trim().length > 0 ||
                     $scope.searchParameters.programAttributeFieldValue.trim().length > 0 ||
@@ -91,6 +92,7 @@ angular.module('bahmni.registration')
                 var searchParameters = $location.search();
                 $scope.searchParameters.addressFieldValue = searchParameters.addressFieldValue || '';
                 $scope.searchParameters.name = searchParameters.name || '';
+                $scope.searchParameters.last_name = searchParameters.last_name || '';
                 $scope.searchParameters.customAttribute = searchParameters.customAttribute || '';
                 $scope.searchParameters.programAttributeFieldValue = searchParameters.programAttributeFieldValue || '';
                 $scope.searchParameters.addressSearchResultsConfig = searchParameters.addressSearchResultsConfig || '';
@@ -103,6 +105,7 @@ angular.module('bahmni.registration')
                         searching = true;
                         var searchPromise = patientService.search(
                             $scope.searchParameters.name,
+                            $scope.searchParameters.last_name,                            
                             undefined,
                             $scope.addressSearchConfig.field,
                             $scope.searchParameters.addressFieldValue,
@@ -130,6 +133,7 @@ angular.module('bahmni.registration')
                         searching = true;
                         var searchPromise = patientService.searchHIE(
                             $scope.searchParameters.name,
+                            $scope.searchParameters.last_name,
                             undefined,
                             $scope.searchParameters.nationalId,
                             $scope.searchParameters.gender,
@@ -150,7 +154,7 @@ angular.module('bahmni.registration')
                                 $scope.noResultsMessage = null;
                                 
                             } else {
-                                $scope.noResultsMessage = 'testing not found message ';
+                                $scope.noResultsMessage = 'REGISTRATION_LABEL_COULD_NOT_FIND_PATIENT';
                             }
                         });
 
@@ -325,11 +329,14 @@ angular.module('bahmni.registration')
 
                 if ($scope.option.selected == "national") {
                     disabled = !$scope.searchParameters.name && !$scope.searchParameters.addressFieldValue
+                    && !$scope.searchParameters.last_name
+                    && !$scope.searchParameters.addressFieldValue
                     && !$scope.searchParameters.customAttribute
                     && !$scope.searchParameters.programAttributeFieldValue
                     && !$scope.searchParameters.nationalIdNumber;
                 } else if ($scope.option.selected == "local") {
                     disabled = !$scope.searchParameters.name && !$scope.searchParameters.addressFieldValue
+                    && !$scope.searchParameters.last_name
                     && !$scope.searchParameters.customAttribute
                     && !$scope.searchParameters.programAttributeFieldValue;
                 }
@@ -354,7 +361,6 @@ angular.module('bahmni.registration')
                 $scope.hieresults = [];
 
                 var patientIdentifier = $scope.searchParameters.registrationNumber;
-                debugger;
                 $location.search({
                     registrationNumber: $scope.searchParameters.registrationNumber,
                     programAttributeFieldName: $scope.programAttributesSearchConfig.field,
@@ -454,6 +460,9 @@ angular.module('bahmni.registration')
                 if ($scope.searchParameters.name) {
                     queryParams.name = $scope.searchParameters.name;
                 }
+                if ($scope.searchParameters.last_name) {
+                    queryParams.last_name = $scope.searchParameters.last_name;
+                }
                 if ($scope.searchParameters.addressFieldValue) {
                     queryParams.addressFieldValue = $scope.searchParameters.addressFieldValue;
                 }
diff --git a/ui/app/registration/services/patientService.js b/ui/app/registration/services/patientService.js
index 7cb3f05b0..8f7db0d21 100644
--- a/ui/app/registration/services/patientService.js
+++ b/ui/app/registration/services/patientService.js
@@ -5,12 +5,13 @@ angular.module('bahmni.registration')
         var openmrsUrl = Bahmni.Registration.Constants.openmrsUrl;
         var baseOpenMRSRESTURL = Bahmni.Registration.Constants.baseOpenMRSRESTURL;
 
-        var search = function (query, identifier, addressFieldName, addressFieldValue, customAttributeValue,
+        var search = function (query, surname, identifier, addressFieldName,  addressFieldValue, customAttributeValue,
                                offset, customAttributeFields, programAttributeFieldName, programAttributeFieldValue, addressSearchResultsConfig,
                                patientSearchResultsConfig, filterOnAllIdentifiers) {
             var config = {
                 params: {
-                    q: query,
+                    q: query + " " + surname,
+                    surname: surname,
                     identifier: identifier,
                     s: "byIdOrNameOrVillage",
                     addressFieldName: addressFieldName,
@@ -29,13 +30,14 @@ angular.module('bahmni.registration')
             };
             return patientServiceStrategy.search(config);
         };
-        var searchHIE = function (query, identifier, nationalId, gender, addressFieldName, addressFieldValue, customAttributeValue,
+        var searchHIE = function (query, surname, identifier, nationalId, gender, addressFieldName, addressFieldValue, customAttributeValue,
                                offset, customAttributeFields, programAttributeFieldName, programAttributeFieldValue, addressSearchResultsConfig,
                                patientSearchResultsConfig, filterOnAllIdentifiers) {
 
             var config = {
                 params: {
-                    q: query,
+                    q: query + " " + surname,
+                    surname: surname,
                     identifier: identifier,
                     nationalId: nationalId,
                     gender: gender,
diff --git a/ui/app/registration/views/search.html b/ui/app/registration/views/search.html
index 8a702d4e3..389b57233 100644
--- a/ui/app/registration/views/search.html
+++ b/ui/app/registration/views/search.html
@@ -43,9 +43,9 @@ <h2 class="section-title">Location</h2>
                     <label for="name"><strong>{{ ::'REGISTRATION_LABEL_NAME' | translate}}</strong></label>
                     <input tabindex="4" type="text" id="name" ng-model="searchParameters.name" placeholder="{{ ::'REGISTRATION_LABEL_ENTER_NAME' | translate}}">
                 </article>
-                <article class="fl" ng-if="::customAttributesSearchConfig.show">
-                    <label for="name"><strong>{{::customAttributesSearchConfig.label}}</strong></label>
-                    <input tabindex="5" type="text" id="customAttribute" ng-model="searchParameters.customAttribute" placeholder="{{::customAttributesSearchConfig.placeholder}}">
+                <article class="fl">
+                    <label for="last_name"><strong>{{ ::'REGISTRATION_LABEL_LAST_NAME' | translate}}</strong></label>
+                    <input tabindex="4" type="text" id="last_name" ng-model="searchParameters.last_name" placeholder="{{ ::'REGISTRATION_LABEL_ENTER_LAST_NAME' | translate}}">
                 </article>
 
                 <article class="fl" ng-show="showNationalId()">