diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/ato/AddressInfo.java b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/ato/AddressInfo.java
index 02ac63210..0c79f941e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/ato/AddressInfo.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/ato/AddressInfo.java
@@ -13,6 +13,7 @@ public class AddressInfo {
     public AddressInfo(String address, String suburb, String state, String postCode, String country) {
         this.address = address;
         this.suburb = suburb;
+        postCode = postCode.replaceAll("\\D", "");
         if (!postCode.matches("^\\d{4}$")) {
             postCode = "9999";
             country = "OTH";
@@ -24,7 +25,9 @@ public class AddressInfo {
             postCode = "9999";
         }
         this.postCode = postCode;
-        this.state = state;
+        if (state != null) {
+            this.state = state.toUpperCase();
+        }
         this.country = country;
     }