diff --git a/gateway-payxpert.php b/gateway-payxpert.php
index d262047..5f8762f 100755
--- a/gateway-payxpert.php
+++ b/gateway-payxpert.php
@@ -130,7 +130,7 @@ public function payxpert_payment_script_footer(){
                     $("#payxpert").remove();
                     var sNew = document.createElement("script");
                     sNew.async = true;
-                    sNew.src = "https://connect2.payxpert.com/payment/"+ gettokken  +"/connect2pay-seamless-v1.4.0.js";
+                    sNew.src = "https://connect2.payxpert.com/payment/"+ gettokken  +"/connect2pay-seamless-v1.4.8.js";
                     sNew.setAttribute('data-mount-in', "#payment-container");
                     sNew.setAttribute('id', "payxpert");
                     sNew.setAttribute('integrity', "sha....");
diff --git a/includes/class-wc-payxpert.php b/includes/class-wc-payxpert.php
index 9029762..f3b1cd9 100755
--- a/includes/class-wc-payxpert.php
+++ b/includes/class-wc-payxpert.php
@@ -435,11 +435,11 @@ public function payxpert_seamless_checkout_field($order_button_text, $carttotal,
             $shopperlastname = $lastname[1] ? urldecode($lastname[1]) : 'Doe';
             $shoppercountry = $country[1] ? urldecode($country[1]) : 'US';
             $shopperstate = $state[1] ? urldecode($state[1]) : 'NY';
-            $shoppercity = $city[1] ? $city[1] : 'New York';
+            $shoppercity = $city[1] ? urldecode($city[1]) : 'New York';
             $shopperaddress = $address[1] ? urldecode($address[1]) : 'Debit Street, 45';
             $shopperpostcode = $postcode[1] ? urldecode($postcode[1]) : '3456TRG';
             $shopperphone = $phone[1] ? urldecode($phone[1]) : '12345678';
-            $shopperemail = str_replace("%40", "@",$email[1]) ? str_replace("%40", "@",$email[1]) : 'shopper@example.com';
+            $shopperemail = $email[1] ? urldecode($email[1]) : 'shopper@example.com';
         }
 
         $c2pClient = new Connect2PayClient($this->getConnectUrl(), $this->getOriginatorId(), $this->getpassword());