diff --git a/shipping/uc_ups/uc_ups.ship.inc b/shipping/uc_ups/uc_ups.ship.inc
index 06a4bec..20c386a 100644
--- a/shipping/uc_ups/uc_ups.ship.inc
+++ b/shipping/uc_ups/uc_ups.ship.inc
@@ -253,18 +253,19 @@ function uc_ups_fulfill_order_validate($form, &$form_state) {
   // This is a total hack to work around changes made in the return value
   // from uc_shipping_address_form().  That function needs to be fixed, but
   // until then this should do the trick.
-  $origin        = $form_state['values']['pickup_address'];
-  $origin->phone = $form_state['values']['phone'];
-  $origin->first_name = $form_state['values']['first_name'];
-  $origin->last_name = $form_state['values']['last_name'];
-  $origin->company = $form_state['values']['company'];
-  $origin->street1 = $form_state['values']['street1'];
-  $origin->street2 = $form_state['values']['street2'];
-  $origin->city = $form_state['values']['city'];
-  $origin->zone = $form_state['values']['zone'];
-  $origin->country = $form_state['values']['country'];
-  $origin->postal_code = $form_state['values']['postal_code'];
-  $origin->email = $form_state['values']['pickup_email'];
+  $origin        = $form_state['values']['pickup_address']['pickup_address'];
+  $origin->phone = $form_state['values']['pickup_address']['phone'];
+  $origin->first_name = $form_state['values']['pickup_address']['first_name'];
+  $origin->last_name = $form_state['values']['pickup_address']['last_name'];
+  $origin->company = $form_state['values']['pickup_address']['company'];
+  $origin->street1 = $form_state['values']['pickup_address']['street1'];
+  $origin->street2 = $form_state['values']['pickup_address']['street2'];
+  $origin->city = $form_state['values']['pickup_address']['city'];
+  $origin->zone = $form_state['values']['pickup_address']['zone'];
+  $origin->country = $form_state['values']['pickup_address']['country'];
+  $origin->postal_code = $form_state['values']['pickup_address']['postal_code'];
+  // Correct E-mail address obtained directly from object in loop above.
+/*   $origin->email = $form_state['values']['pickup_address']['pickup_email']; */
 
   $_SESSION['ups'] = array();
   $_SESSION['ups']['origin'] = $origin;