diff --git a/admin-spa/src/routes/Orders/partials/OrderForm.tsx b/admin-spa/src/routes/Orders/partials/OrderForm.tsx
index 8347c6f..88c98c1 100644
--- a/admin-spa/src/routes/Orders/partials/OrderForm.tsx
+++ b/admin-spa/src/routes/Orders/partials/OrderForm.tsx
@@ -149,13 +149,15 @@ export default function OrderForm({
     if (oneCountryOnly) {
       const only = countries[0]?.code || '';
       if (shipDiff) {
-        if (only && sCountry !== only) setSCountry(only);
+        if (only && shippingData.country !== only) {
+          setShippingData({...shippingData, country: only});
+        }
       } else {
         // keep shipping synced to billing when not different
-        setSCountry(bCountry);
+        setShippingData({...shippingData, country: bCountry});
       }
     }
-  }, [oneCountryOnly, countries, shipDiff, bCountry, sCountry]);
+  }, [oneCountryOnly, countries, shipDiff, bCountry, shippingData.country]);
 
   // Order meta
   const [status, setStatus] = React.useState(initial?.status || 'pending');
@@ -292,7 +294,7 @@ export default function OrderForm({
 
   // Keep shipping country synced to billing when unchecked
   React.useEffect(() => {
-    if (!shipDiff) setSCountry(bCountry);
+    if (!shipDiff) setShippingData({...shippingData, country: bCountry});
   }, [shipDiff, bCountry]);
 
   // Clamp states when country changes
@@ -300,12 +302,13 @@ export default function OrderForm({
     if (bState && !states[bCountry]?.[bState]) setBState('');
   }, [bCountry]);
   React.useEffect(() => {
-    if (sState && !states[sCountry]?.[sState]) setSState('');
-  }, [sCountry]);
+    if (shippingData.state && !states[shippingData.country]?.[shippingData.state]) {
+      setShippingData({...shippingData, state: ''});
+    }
+  }, [shippingData.country]);
 
   const countryOptions = countries.map(c => ({ value: c.code, label: `${c.name} (${c.code})` }));
   const bStateOptions = Object.entries(states[bCountry] || {}).map(([code, name]) => ({ value: code, label: name }));
-  const sStateOptions = Object.entries(states[sCountry] || {}).map(([code, name]) => ({ value: code, label: name }));
 
   async function handleSubmit(e: React.FormEvent) {
     e.preventDefault();
@@ -692,13 +695,15 @@ export default function OrderForm({
                         // Autofill shipping if available
                         if (data.shipping && data.shipping.address_1) {
                           setShipDiff(true);
-                          setSFirst(data.shipping.first_name || '');
-                          setSLast(data.shipping.last_name || '');
-                          setSAddr1(data.shipping.address_1 || '');
-                          setSCity(data.shipping.city || '');
-                          setSPost(data.shipping.postcode || '');
-                          setSCountry(data.shipping.country || bCountry);
-                          setSState(data.shipping.state || '');
+                          setShippingData({
+                            first_name: data.shipping.first_name || '',
+                            last_name: data.shipping.last_name || '',
+                            address_1: data.shipping.address_1 || '',
+                            city: data.shipping.city || '',
+                            postcode: data.shipping.postcode || '',
+                            country: data.shipping.country || bCountry,
+                            state: data.shipping.state || '',
+                          });
                         }
                       }
                       
diff --git a/admin-spa/src/routes/Settings/Tax.tsx b/admin-spa/src/routes/Settings/Tax.tsx
index 7ac7a56..8db6274 100644
--- a/admin-spa/src/routes/Settings/Tax.tsx
+++ b/admin-spa/src/routes/Settings/Tax.tsx
@@ -24,7 +24,7 @@ export default function TaxSettings() {
   const [editingRate, setEditingRate] = useState<any | null>(null);
   const [deletingRate, setDeletingRate] = useState<any | null>(null);
   const [dismissedSuggestions, setDismissedSuggestions] = useState<string[]>([]);
-  const [selectedTaxClass, setSelectedTaxClass] = useState<string>('');
+  const [selectedTaxClass, setSelectedTaxClass] = useState<string>('standard');
 
   // Fetch tax settings
   const { data: settings, isLoading } = useQuery({
@@ -142,7 +142,7 @@ export default function TaxSettings() {
       state: formData.get('state') as string || '',
       rate: parseFloat(formData.get('rate') as string),
       name: formData.get('name') as string,
-      tax_class: selectedTaxClass || '',
+      tax_class: selectedTaxClass === 'standard' ? '' : selectedTaxClass,
       priority: 1,
       compound: 0,
       shipping: 1,
@@ -222,7 +222,7 @@ export default function TaxSettings() {
               <Button
                 size="sm"
                 onClick={() => {
-                  setSelectedTaxClass('');
+                  setSelectedTaxClass('standard');
                   setShowAddRate(true);
                 }}
               >
@@ -396,10 +396,10 @@ export default function TaxSettings() {
         if (!open) {
           setShowAddRate(false);
           setEditingRate(null);
-          setSelectedTaxClass('');
+          setSelectedTaxClass('standard');
         } else {
-          // Initialize tax class when opening
-          setSelectedTaxClass(editingRate?.tax_class || '');
+          // Initialize tax class when opening (convert empty to 'standard')
+          setSelectedTaxClass(editingRate?.tax_class || 'standard');
         }
       }}>
         <DialogContent>
@@ -464,12 +464,12 @@ export default function TaxSettings() {
 
               <div>
                 <Label>{__('Tax Class (Optional)')}</Label>
-                <Select value={selectedTaxClass} onValueChange={setSelectedTaxClass}>
+                <Select value={selectedTaxClass || 'standard'} onValueChange={setSelectedTaxClass}>
                   <SelectTrigger>
                     <SelectValue placeholder={__('Standard')} />
                   </SelectTrigger>
                   <SelectContent>
-                    <SelectItem value="">{__('Standard')}</SelectItem>
+                    <SelectItem value="standard">{__('Standard')}</SelectItem>
                     <SelectItem value="reduced-rate">{__('Reduced Rate')}</SelectItem>
                     <SelectItem value="zero-rate">{__('Zero Rate')}</SelectItem>
                   </SelectContent>