Have the State field dynamically sync with the country field to have the states pre populated based on the country selected.
e.g. Default selection - US - State field shows all US states. If the user selects the country to be Australia then the states are refreshed to show the Australian states.
I was looking for the solution from two days as i have the same issue must share if you got the answer for ePayitonline Login