diff --git a/sites/all/modules/uc_securepayau/uc_securepayau.module b/sites/all/modules/uc_securepayau/uc_securepayau.module
index fe0fef0..6d3f05b 100755
--- a/sites/all/modules/uc_securepayau/uc_securepayau.module
+++ b/sites/all/modules/uc_securepayau/uc_securepayau.module
@@ -81,13 +81,17 @@ function uc_securepayau_settings_form() {
     '#title' => t('Mode/Settings'),
     '#description' => t('This allows you to set settings for the securepay account you are accessing.'),
   );
+  
   $form['settings']['uc_securepayau_currency'] = array(
     '#type' => 'select',
     '#title' => 'Currency',
-    '#default_value' => variable_get('uc_securepayau_currency', variable_get('uc_currency_code', 'AUD')),
-    '#options' => array('AUD' => 'AUD', 
-                        'USD' => 'USD'),
+    '#description' => t('Select which currency to execute the transaction with'),
+    '#default_value' => variable_get('uc_securepayau_currency', 'AUD'),
+    '#options' => array('default' => 'Use default uc_currency_code from uc_orders record',
+                        'AUD' => 'Override with AUD', 
+                        'USD' => 'Override with USD'),
   );
+  
   $account_types = array(
       'live' => t('Live transactions in a live account'),
       'test' => t('Developer test account transactions'),
@@ -145,7 +149,7 @@ function _uc_securepayau_charge($order, $amount, $data) {
           'txnType' => '0',  // 0 = Standard Payment
           'txnSource' => '23',  // 23 = XML
           'amount' => (int)($amount*100), // amount takes a value in cents
-          'currency' => variable_get('uc_securepayau_currency', 'AUD'),
+          'currency' => variable_get('uc_securepayau_currency', 'default') ? $order->currency : variable_get('uc_securepayau_currency', 'AUD'),
           'purchaseOrderNo' => $order->order_id,
           'CreditCardInfo' => array(
             'cardNumber' => $order->payment_details['cc_number'],
@@ -573,7 +577,7 @@ function _uc_securepayau_create_account_xml($order, $fee) {
         'PeriodicItem ID="1"' => array(
           'actionType' => 'add', 
           'clientID' => $fee->data['subscription_id'],
-          'currency' => variable_get('uc_securepayau_currency', 'AUD'),
+          'currency' => variable_get('uc_securepayau_currency', 'default') ? $order->currency : variable_get('uc_securepayau_currency', 'AUD'),
           'CreditCardInfo' => array(
             'cardNumber' => $order->payment_details['cc_number'],
             'expiryDate' => $order->payment_details['cc_exp_month'] .'/'. substr($order->payment_details['cc_exp_year'], -2),