Fix for city and state saving for customer