diff --git a/src/QUI/ERP/Shipping/EventHandler.php b/src/QUI/ERP/Shipping/EventHandler.php
index 09b0e1125c911fe977cbb31b9e0cd3dc7ca0fa7e..41038d8f8951e4702a6cfb67198f115952c5e1c9 100644
--- a/src/QUI/ERP/Shipping/EventHandler.php
+++ b/src/QUI/ERP/Shipping/EventHandler.php
@@ -287,6 +287,13 @@ public static function onUserSaveBegin(QUI\Users\User $User)
         $submit  = $Request->get('submit-shipping');
         $address = (int)$Request->get('shipping-address');
 
+        if (isset($_REQUEST['step'])
+            && $_REQUEST['step'] === 'Customer'
+            && !empty($_REQUEST['shipping-address'])
+        ) {
+            $address = (int)$_REQUEST['shipping-address'];
+        }
+
         if ($submit === false || !$address) {
             return;
         }