--- uc_ups.module	Wed Nov 18 14:55:13 2009
+++ uc_ups.module.new	Thu Nov 19 12:01:16 2009
@@ -985,17 +985,25 @@ function uc_ups_fulfill_order($form_stat
     $form['destination'][$field]['#required'] = TRUE;
   }
 
-  $ups_services = _uc_ups_service_list();
-  $services = array_filter(variable_get('uc_ups_services', array()));
-  foreach ($services as $ups_id => $service) {
-    $services[$ups_id] = $ups_services[$ups_id];
-  }
-  if (count($services)) {
-    $form['service'] = array('#type' => 'select',
-      '#title' => t('UPS service'),
-      '#options' => $services,
-    );
+  $services = _uc_ups_service_list();
+  $default_service = '';
+  $method = $order->quote['method'];
+  if ($method == 'ups') {
+    $default_service = $order->quote['accessorials'];
+    $method          = $services[$default_service];
   }
+
+  // Inform user of customer's shipping choice
+  $form['shipping_choice'] = array(
+    '#type' => 'markup',
+    '#value' => t('Customer selected @method as the shipping method and paid @rate', array('@method' => $method, '@rate' => uc_currency_format($order->quote['rate']))),
+  );
+
+  $form['service'] = array('#type' => 'select',
+    '#title' => t('UPS service'),
+    '#options' => _uc_ups_service_list(),
+    '#default_value' => $default_service,
+  );
   $today = getdate();
   $form['ship_date'] = array('#type' => 'date',
     '#title' => t('Ship date'),