Fixing issue where addresses were not repopulated when validation fails