diff --git a/client/src/components/domain/domain-table.tsx b/client/src/components/domain/domain-table.tsx
index e3d5240..e9ac1fb 100644
--- a/client/src/components/domain/domain-table.tsx
+++ b/client/src/components/domain/domain-table.tsx
@@ -44,30 +44,35 @@ export function DomainTable({ onManageDomain, onDeleteDomain, onAddDomain }: Dom
   });
 
   const getProviderName = (providerId: string | null | undefined) => {
-    // Special debugging logs
-    console.log("Provider ID:", providerId);
-    console.log("Available providers:", providers);
-    
-    if (!providerId) return "None";
+    // Handle completely empty providerId cases
+    if (!providerId || providerId === "") {
+      return "None";
+    }
     
     // Check if the provider exists in our providers list
+    // The providerId from the database will be a string UUID
     const provider = providers.find(p => p.id === providerId);
     
     if (provider) {
-      console.log("Found provider:", provider);
       return provider.name;
     } else {
-      console.log("Provider not found for ID:", providerId);
-      return "Unknown";
+      // If we have a providerId but can't find the provider (might be deleted)
+      return "Unknown Provider";
     }
   };
 
   const getProviderIcon = (providerId: string | null | undefined) => {
-    if (!providerId) return <CircleHelp className="mr-2 text-primary" size={16} />;
+    // Handle completely empty providerId cases
+    if (!providerId || providerId === "") {
+      return <CircleHelp className="mr-2 text-muted-foreground" size={16} />;
+    }
     
+    // The providerId from the database will be a string UUID
     const provider = providers.find(p => p.id === providerId);
     
-    if (!provider) return <CircleHelp className="mr-2 text-primary" size={16} />;
+    if (!provider) {
+      return <CircleHelp className="mr-2 text-warning" size={16} />;
+    }
     
     switch (provider.type) {
       case "cloudflare":
diff --git a/client/src/pages/domains.tsx b/client/src/pages/domains.tsx
index 3b661f2..b0f2cb5 100644
--- a/client/src/pages/domains.tsx
+++ b/client/src/pages/domains.tsx
@@ -46,9 +46,14 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Loader2 } from "lucide-react";
 
+// Domain name regex
+const domainRegex = /^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\.)+[A-Za-z]{2,}$/;
+
 // Domain form schema
 const domainFormSchema = z.object({
-  name: z.string().min(3, "Domain name must be at least 3 characters"),
+  name: z.string()
+    .min(3, "Domain name must be at least 3 characters")
+    .regex(domainRegex, "Please enter a valid domain name (e.g., example.com)"),
   providerId: z.string().uuid().optional(),
   isActive: z.boolean().default(true),
 });