diff --git a/client/html/src/Client/Html/Checkout/Standard/Address/Billing/Standard.php b/client/html/src/Client/Html/Checkout/Standard/Address/Billing/Standard.php
index 79b037e27..8023a8de9 100644
--- a/client/html/src/Client/Html/Checkout/Standard/Address/Billing/Standard.php
+++ b/client/html/src/Client/Html/Checkout/Standard/Address/Billing/Standard.php
@@ -593,8 +593,7 @@ protected function setAddress( \Aimeos\MW\View\Iface $view )
 				throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one billing address part is missing or invalid' ) );
 			}
 
-			$cntl = \Aimeos\Controller\Frontend::create( $context, 'customer' )->uses( [] );
-			$params = $cntl->add( $params )->store()->get()->getPaymentAddress()->toArray();
+			\Aimeos\Controller\Frontend::create( $context, 'customer' )->uses( [] )->add( $params )->store();
 		}
 
 		$basketCtrl->addAddress( $type, $params, 0 );
diff --git a/client/html/src/Client/Html/Checkout/Standard/Address/Delivery/Standard.php b/client/html/src/Client/Html/Checkout/Standard/Address/Delivery/Standard.php
index d8d33adce..7a53623e0 100644
--- a/client/html/src/Client/Html/Checkout/Standard/Address/Delivery/Standard.php
+++ b/client/html/src/Client/Html/Checkout/Standard/Address/Delivery/Standard.php
@@ -493,8 +493,8 @@ protected function setAddress( \Aimeos\MW\View\Iface $view )
 
 			if( ( $address = $cntl->uses( ['customer/address'] )->get()->getAddressItem( $option ) ) !== null )
 			{
-				$cntl->addAddressItem( $address->fromArray( $params ), $option )->store();
-				$params = $address->toArray();
+				$data = $params;
+				$cntl->addAddressItem( $address->fromArray( $data ), $option )->store();
 			}
 
 			$basketCtrl->addAddress( $type, $params, 0 );