--- ecommerce/store/store.module.bak	2007-05-11 23:56:43.000000000 +1000
+++ ecommerce/store/store.module	2007-05-11 23:59:19.000000000 +1000
@@ -1234,6 +1234,13 @@
         '#default_value' => TRUE,
       );
     }
+    else
+    {
+      $form['change_workflow'] = array(
+        '#type' => 'hidden',
+        '#value' => TRUE,
+      );
+    }
     $form['wf'] = array('#type' => 'value', '#value' => $workflow);
   }
 
--- ecommerce/shipping/shipping.module.bak	2007-05-12 00:01:27.000000000 +1000
+++ ecommerce/shipping/shipping.module	2007-05-12 00:01:40.000000000 +1000
@@ -59,7 +59,7 @@
             'title' => t('Shipping'),
             'description' => t('Shipping notification page.'),
             'callback' => 'drupal_get_form',
-            'callback arguments' => array('store_transaction_mail_form', arg(4), t('Shipping notification'), ECMAIL_TYPE_SHIP_NOTICE),
+            'callback arguments' => array('store_transaction_mail_form', arg(4), t('Shipping notification'), ECMAIL_TYPE_SHIP_NOTICE, TRUE),
             'access' => user_access('administer store'),
             'type' => MENU_CALLBACK
           );