diff --git a/management/src/components/TenantModal.jsx b/management/src/components/TenantModal.jsx
index 686ad43..5b73e49 100644
--- a/management/src/components/TenantModal.jsx
+++ b/management/src/components/TenantModal.jsx
@@ -129,7 +129,10 @@ const TenantModal = ({ isOpen, onClose, tenant = null, onSave }) => {
 
       const tenantData = {
         ...formData,
-        auth_config: cleanAuthConfig
+        auth_config: cleanAuthConfig,
+        // Convert empty email strings to null to avoid validation errors
+        admin_email: formData.admin_email?.trim() || null,
+        billing_email: formData.billing_email?.trim() || null
       }
 
       await onSave(tenantData)
@@ -238,6 +241,19 @@ const TenantModal = ({ isOpen, onClose, tenant = null, onSave }) => {
                 />
               </div>
 
+              <div>
+                <label className="block text-sm font-medium text-gray-700 mb-1">
+                  Billing Email
+                </label>
+                <input
+                  type="email"
+                  value={formData.billing_email}
+                  onChange={(e) => setFormData(prev => ({ ...prev, billing_email: e.target.value }))}
+                  className="w-full border border-gray-300 rounded-md px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500"
+                  placeholder="billing@acme.com"
+                />
+              </div>
+
               <div className="flex items-center">
                 <input
                   type="checkbox"