diff --git a/source/static/assets/js/shipment.js b/source/static/assets/js/shipment.js
index bd40d1f..ebbe69a 100644
--- a/source/static/assets/js/shipment.js
+++ b/source/static/assets/js/shipment.js
@@ -28,6 +28,7 @@ function getRateAndValidateAddress() {
                     $("input[name=from_city]").val(resp.fromaddress.city);
                     $("input[name=from_state]").val(resp.fromaddress.state);
                     $("input[name=from_zip]").val(resp.fromaddress.zip);
+                    $("input[name=from_email]").val(resp.fromaddress.email);
 
                     $("#toaddr").html(
                             resp.address.name
diff --git a/source/static/makeshipment.php b/source/static/makeshipment.php
index f6bebcc..eb068bc 100644
--- a/source/static/makeshipment.php
+++ b/source/static/makeshipment.php
@@ -154,7 +154,8 @@ try {
             "street2" => $fromaddress->street2 ?? "",
             "city" => $fromaddress->city ?? "",
             "state" => $fromaddress->state ?? "",
-            "zip" => $fromaddress->zip ?? ""
+            "zip" => $fromaddress->zip ?? "",
+            "email" => $fromaddress->email ?? ""
         ]]
     ));
 } catch (Exception $ex) {
diff --git a/source/static/payshipment.php b/source/static/payshipment.php
index 56017b0..7cec9c6 100644
--- a/source/static/payshipment.php
+++ b/source/static/payshipment.php
@@ -31,7 +31,7 @@ try {
                 'payment_method' => $_REQUEST["stripeid"],
                 'description' => "CertifiedFromHome.com",
                 'statement_descriptor' => "CrtfdFrmHome",
-                'payment_method_types' => ['card'],
+                'payment_method_types' => ['card', 'link'],
                 'capture_method' => 'manual',
                 'confirm' => true
     ]);