diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php
index b658ee6e6db5..d0f892cb6b39 100644
--- a/CRM/Contact/Form/Search/Criteria.php
+++ b/CRM/Contact/Form/Search/Criteria.php
@@ -297,6 +297,8 @@ public static function location(&$form) {
 
     $elements = array(
       'street_address' => array(ts('Street Address'), $attributes['street_address'], NULL, NULL),
+      'supplemental_address_1' => array(ts('Supplemental Address 1'), $attributes['supplemental_address_1'], NULL, NULL),
+      'supplemental_address_2' => array(ts('Supplemental Address 2'), $attributes['supplemental_address_2'], NULL, NULL),
       'city' => array(ts('City'), $attributes['city'], NULL, NULL),
       'postal_code' => array(ts('Postal Code'), $attributes['postal_code'], NULL, NULL),
       'country' => array(ts('Country'), $attributes['country_id'], 'country', FALSE),
diff --git a/templates/CRM/Contact/Form/Search/Criteria/Location.tpl b/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
index 0f138c7dc2a4..2309aaa448bd 100644
--- a/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
+++ b/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
@@ -49,6 +49,14 @@
           </table>
         </div>
         {/if}
+        <div class="crm-field-wrapper">
+          {$form.supplemental_address_1.label}<br />
+          {$form.supplemental_address_1.html}
+        </div>
+        <div class="crm-field-wrapper">
+          {$form.supplemental_address_2.label}<br />
+          {$form.supplemental_address_2.html}
+        </div>
         <div class="crm-field-wrapper">
           {$form.city.label}<br />
           {$form.city.html}
@@ -158,5 +166,3 @@
     </script>
   {/literal}
 {/if}
-
-