diff --git a/swf-plugin-collab/src/main/java/com/venky/swf/plugins/collab/extensions/beforesave/BeforeValidateAddress.java b/swf-plugin-collab/src/main/java/com/venky/swf/plugins/collab/extensions/beforesave/BeforeValidateAddress.java
index <HASH>..<HASH> 100644
--- a/swf-plugin-collab/src/main/java/com/venky/swf/plugins/collab/extensions/beforesave/BeforeValidateAddress.java
+++ b/swf-plugin-collab/src/main/java/com/venky/swf/plugins/collab/extensions/beforesave/BeforeValidateAddress.java
@@ -51,5 +51,11 @@ public class BeforeValidateAddress<M extends Address & Model> extends BeforeMode
                 throw new RuntimeException("Email is invalid!");
             }
         }
+        if (model.getCityId() != null) {
+            model.setStateId(model.getCity().getStateId());
+        }
+        if (model.getStateId() != null) {
+            model.setCountryId(model.getState().getCountryId());
+        }
     }
 }
fix state etc on beforevalidate of address