diff --git a/src/servala/core/admin.py b/src/servala/core/admin.py
index b8171f9..66a4b30 100644
--- a/src/servala/core/admin.py
+++ b/src/servala/core/admin.py
@@ -56,12 +56,18 @@ class OrganizationMembershipInline(admin.TabularInline):
 
 @admin.register(Organization)
 class OrganizationAdmin(admin.ModelAdmin):
-    list_display = ("name", "billing_entity", "origin")
+    list_display = ("name", "namespace", "billing_entity", "origin")
     list_filter = ("origin",)
-    search_fields = ("name",)
+    search_fields = ("name", "namespace")
     autocomplete_fields = ("billing_entity", "origin")
     inlines = (OrganizationMembershipInline,)
 
+    def get_readonly_fields(self, request, obj=None):
+        readonly_fields = list(super().get_readonly_fields(request, obj) or [])
+        if obj:  # If this is an edit (not a new organization)
+            readonly_fields.append("namespace")
+        return readonly_fields
+
 
 @admin.register(BillingEntity)
 class BillingEntityAdmin(admin.ModelAdmin):