diff --git a/app/controllers/PaymentController.php b/app/controllers/PaymentController.php
index f9f824c9151e..86426eb43d8f 100755
--- a/app/controllers/PaymentController.php
+++ b/app/controllers/PaymentController.php
@@ -156,7 +156,7 @@ class PaymentController extends \BaseController
             'card' => $card,
             'currency' => $invoice->client->currency->code,
             'returnUrl' => URL::to('complete'),
-            'cancelUrl' => URL::to('/'),
+            'cancelUrl' => URL::to('/')
         ];
     }
 
@@ -205,6 +205,14 @@ class PaymentController extends \BaseController
             $accountGateway = $invoice->client->account->account_gateways[0];
             $gateway = self::createGateway($accountGateway);
 
+            $client = $invoice->client;
+            $client->address1 = trim(Input::get('address1'));
+            $client->address2 = trim(Input::get('address2'));
+            $client->city = trim(Input::get('city'));
+            $client->state = trim(Input::get('state'));
+            $client->postal_code = trim(Input::get('postal_code'));
+            $client->save();
+
             try
             {
                 $details = self::getPaymentDetails($invoice, Input::all());
diff --git a/app/views/accounts/settings.blade.php b/app/views/accounts/settings.blade.php
index 2cc5d71ffd6f..e53cb42d6932 100755
--- a/app/views/accounts/settings.blade.php
+++ b/app/views/accounts/settings.blade.php
@@ -16,7 +16,7 @@
 		@foreach ($accountGateway->fields as $field => $junk)
 			@if ($field == 'testMode' || $field == 'developerMode')
 				@if ($config->$field)
-					{{ Former::populateField($accountGateway->gateway_id.'_'.$field, true ) }}
+					{{-- Former::populateField($accountGateway->gateway_id.'_'.$field, true ) --}}
 				@endif
 			@else
 				{{ Former::populateField($accountGateway->gateway_id.'_'.$field, $config->$field) }}
@@ -35,7 +35,7 @@
 				@if ($field == 'solutionType' || $field == 'landingPage')
 					{{-- do nothing --}}
 				@elseif ($field == 'testMode' || $field == 'developerMode') 
-					{{ Former::checkbox($gateway->id.'_'.$field)->label(Utils::toSpaceCase($field))->text('Enable') }}				
+					{{-- Former::checkbox($gateway->id.'_'.$field)->label(Utils::toSpaceCase($field))->text('Enable') --}}				
 				@else
 					{{ Former::text($gateway->id.'_'.$field)->label(Utils::toSpaceCase($field)) }}				
 				@endif
diff --git a/public/js/script.js b/public/js/script.js
index ec24efb14b52..ee8e52f33485 100755
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -347,7 +347,7 @@ function generatePDF(invoice, checkMath) {
 
 	x += 16;
 
-	if (checkMath && parseFloat(total) != parseFloat(invoice.amount)) 
+	if (checkMath && parseFloat(total).toFixed(4) != parseFloat(invoice.amount).toFixed(4)) 
 	{
 		var doc = new jsPDF('p', 'pt');
 		doc.setFont('Helvetica','');