Index: uc_moneris.module
===================================================================
--- uc_moneris.module	(revision 1697)
+++ uc_moneris.module	(working copy)
@@ -285,7 +285,7 @@
       'enabled' => t('Enabled'),
     ),
     '#default_value' => variable_get('uc_moneris_avs_enable', 'disabled'),
-    '#description' => t('eFraud must be enabled on your Moneris account.'),
+    '#description' => t('eFraud must be enabled on your Moneris account. Enabled only with US and Canadian billing addreses'),
   );
 
   $form['moneris_settings']['uc_moneris_vbv_enable'] = array(
@@ -342,7 +342,8 @@
   $store_id   = variable_get('uc_moneris_store_id', '');
   $api_token  = variable_get('uc_moneris_api_token', '');
   $use_cvv    = variable_get('uc_moneris_cvv_enable', 'disabled');
-  $use_avs    = variable_get('uc_moneris_avs_enable', 'disabled');
+  // According to Moneris support, AVS only works with US or Canadian Addresses.
+  $use_avs    = variable_get('uc_moneris_avs_enable', 'disabled') == 'enabled' && ($order->billing_country == '124' || $order->billing_country == '840') ? FALSE;
   $txn_type    = uc_moneris_transaction_type();
   // Use the MonthDayHoursMinutesSeconds as the unique prefix
   $xid = 'cs'. date("mdHis", time()) . str_pad($order->order_id, 8, '0', STR_PAD_LEFT);    // Must be 20 Alpha/Numeric Chars exactly
@@ -420,7 +421,7 @@
       $this_trans_type = uc_moneris_preauth_string();
     }
 
-    if ($use_avs == 'enabled') {
+    if ($use_avs) {
       $street_number = explode(' ', $order->billing_street1);
       $street_number = $street_number[0];
       $street_name = substr($order->billing_street1, strlen($street_number) + 1);
@@ -457,7 +458,7 @@
     if ($use_cvv == 'enabled') {
       $mpgTxn->setCvdInfo($mpgCvdInfo);
     }
-    if ($use_avs == 'enabled') {
+    if ($use_avs) {
       $mpgTxn->setAvsInfo($mpgAvsInfo);
     }
     /****************************** Request Object *******************************/
@@ -513,7 +514,7 @@
        return $result;
       }
     }
-    if ($use_avs == 'enabled') {
+    if ($use_avs) {
       $avs_response = $mpgResponse->getAvsResultCode();
       $avs_accept = array();
       if ($order->billing_country == 840) {