diff --git a/Civi/ActionProvider/Action/Contact/ContactActionUtils.php b/Civi/ActionProvider/Action/Contact/ContactActionUtils.php
index 87964b438ef666e4e9cba0189689d53e55905eea..c83913861313d226d00a1942c11f5a17d28690a7 100644
--- a/Civi/ActionProvider/Action/Contact/ContactActionUtils.php
+++ b/Civi/ActionProvider/Action/Contact/ContactActionUtils.php
@@ -132,6 +132,14 @@ class ContactActionUtils {
       $addressParams['supplemental_address_1'] = $parameters->getParameter('supplemental_address_1');
       $hasAddressParams = true;
     }
+    if ($parameters->doesParameterExists('supplemental_address_2')) {
+      $addressParams['supplemental_address_2'] = $parameters->getParameter('supplemental_address_2');
+      $hasAddressParams = true;
+    }
+    if ($parameters->doesParameterExists('supplemental_address_3')) {
+      $addressParams['supplemental_address_3'] = $parameters->getParameter('supplemental_address_3');
+      $hasAddressParams = true;
+    }
     if ($parameters->doesParameterExists('street_name')) {
       $addressParams['street_name'] = $parameters->getParameter('street_name');
       $hasAddressParams = true;
@@ -194,16 +202,18 @@ class ContactActionUtils {
    * Update the parameter specification for create address.
    */
   public static function createAddressParameterSpecification(SpecificationBag $spec) {
-    $spec->addSpecification(new Specification('name', 'String', E::ts('Address name'), false));
-    $spec->addSpecification(new Specification('street_address', 'String', E::ts('Street and housenumber'), false));
-    $spec->addSpecification(new Specification('supplemental_address_1', 'String', E::ts('Supplemental address 1'), false));
-    $spec->addSpecification(new Specification('street_name', 'String', E::ts('Street name'), false));
-    $spec->addSpecification(new Specification('street_number', 'String', E::ts('Housenumber'), false));
+    $spec->addSpecification(new Specification('name', 'String', E::ts('Address Name'), false));
+    $spec->addSpecification(new Specification('street_address', 'String', E::ts('Street Address'), false));
+    $spec->addSpecification(new Specification('supplemental_address_1', 'String', E::ts('Supplemental Address 1'), false));
+    $spec->addSpecification(new Specification('supplemental_address_2', 'String', E::ts('Supplemental Address 2'), false));
+    $spec->addSpecification(new Specification('supplemental_address_3', 'String', E::ts('Supplemental Address 3'), false));
+    $spec->addSpecification(new Specification('street_name', 'String', E::ts('Street Name'), false));
+    $spec->addSpecification(new Specification('street_number', 'String', E::ts('Street Number'), false));
     $spec->addSpecification(new Specification('street_unit', 'String', E::ts('Street Unit'), false));
-    $spec->addSpecification(new Specification('postal_code', 'String', E::ts('Postal code'), false));
+    $spec->addSpecification(new Specification('postal_code', 'String', E::ts('Postal Code'), false));
     $spec->addSpecification(new Specification('city', 'String', E::ts('City'), false));
-    $spec->addSpecification(new Specification('state_province_id', 'Integer', E::ts('State/Province ID'), false, null, 'StateProvince'));
-    $spec->addSpecification(new Specification('country_id', 'Integer', E::ts('Country ID'), false, null, 'Country'));
+    $spec->addSpecification(new Specification('state_province_id', 'Integer', E::ts('State/Province'), false, null, 'StateProvince'));
+    $spec->addSpecification(new Specification('country_id', 'Integer', E::ts('Country'), false, null, 'Country'));
     $spec->addSpecification(new Specification('manual_geo_code', 'Boolean', E::ts('Manual Geo Code'), false, false));
     $spec->addSpecification(new Specification('latitude', 'Float', E::ts('Latitude'), false, null, null));
     $spec->addSpecification(new Specification('longitude', 'Float', E::ts('Longitude'), false, null, null));
diff --git a/Civi/ActionProvider/Action/Generic/Geocode.php b/Civi/ActionProvider/Action/Generic/Geocode.php
index f2de79d0fb0068d49c7086a155f6279dfc8a2652..3b8b8c504f6fb9ea81c89f8c8d49ac53808cd24e 100644
--- a/Civi/ActionProvider/Action/Generic/Geocode.php
+++ b/Civi/ActionProvider/Action/Generic/Geocode.php
@@ -47,6 +47,12 @@ class Geocode extends AbstractAction {
     if ($parameters->doesParameterExists('supplemental_address_1')) {
       $addressParams['supplemental_address_1'] = $parameters->getParameter('supplemental_address_1');
     }
+    if ($parameters->doesParameterExists('supplemental_address_2')) {
+      $addressParams['supplemental_address_2'] = $parameters->getParameter('supplemental_address_2');
+    }
+    if ($parameters->doesParameterExists('supplemental_address_3')) {
+      $addressParams['supplemental_address_3'] = $parameters->getParameter('supplemental_address_3');
+    }
     if ($parameters->doesParameterExists('street_name')) {
       $addressParams['street_name'] = $parameters->getParameter('street_name');
     }
@@ -107,16 +113,18 @@ class Geocode extends AbstractAction {
    */
   public function getParameterSpecification() {
     $spec = new SpecificationBag();
-    $spec->addSpecification(new Specification('name', 'String', E::ts('Address name'), false));
-    $spec->addSpecification(new Specification('street_address', 'String', E::ts('Street and housenumber'), false));
-    $spec->addSpecification(new Specification('supplemental_address_1', 'String', E::ts('Supplemental address 1'), false));
-    $spec->addSpecification(new Specification('street_name', 'String', E::ts('Street name'), false));
-    $spec->addSpecification(new Specification('street_number', 'String', E::ts('Housenumber'), false));
+    $spec->addSpecification(new Specification('name', 'String', E::ts('Address Name'), false));
+    $spec->addSpecification(new Specification('street_address', 'String', E::ts('Street Address'), false));
+    $spec->addSpecification(new Specification('supplemental_address_1', 'String', E::ts('Supplemental Address 1'), false));
+    $spec->addSpecification(new Specification('supplemental_address_2', 'String', E::ts('Supplemental Address 2'), false));
+    $spec->addSpecification(new Specification('supplemental_address_3', 'String', E::ts('Supplemental Address 3'), false));
+    $spec->addSpecification(new Specification('street_name', 'String', E::ts('Street Name'), false));
+    $spec->addSpecification(new Specification('street_number', 'String', E::ts('Street Number'), false));
     $spec->addSpecification(new Specification('street_unit', 'String', E::ts('Street Unit'), false));
-    $spec->addSpecification(new Specification('postal_code', 'String', E::ts('Postal code'), false));
+    $spec->addSpecification(new Specification('postal_code', 'String', E::ts('Postal Code'), false));
     $spec->addSpecification(new Specification('city', 'String', E::ts('City'), false));
-    $spec->addSpecification(new Specification('state_province_id', 'Integer', E::ts('State/Province ID'), false, null, 'StateProvince'));
-    $spec->addSpecification(new Specification('country_id', 'Integer', E::ts('Country ID'), false, null, 'Country'));
+    $spec->addSpecification(new Specification('state_province_id', 'Integer', E::ts('State/Province'), false, null, 'StateProvince'));
+    $spec->addSpecification(new Specification('country_id', 'Integer', E::ts('Country'), false, null, 'Country'));
     return $spec;
   }