diff --git a/src/servala/core/crd.py b/src/servala/core/crd.py
index 6ae70c9..8c31a27 100644
--- a/src/servala/core/crd.py
+++ b/src/servala/core/crd.py
@@ -560,7 +560,7 @@ class CustomFormMixin(FormGeneratorMixin):
                 field = self.fields[field_name]
                 field_type = field_config.get("type")
 
-                field.label = field_config.get("label", field_name)
+                field.label = field_config.get("label", field_config["name"])
                 field.help_text = field_config.get("help_text", "")
                 field.required = field_config.get("required", False)
 
diff --git a/src/servala/core/forms.py b/src/servala/core/forms.py
index dacd956..36f8be5 100644
--- a/src/servala/core/forms.py
+++ b/src/servala/core/forms.py
@@ -192,7 +192,7 @@ class ServiceDefinitionAdminForm(forms.ModelForm):
         schema = None
         try:
             schema = crd.resource_schema
-        except Exception:
+        except Exception as e:
             pass
 
         if not schema or not (spec_schema := schema.get("properties", {}).get("spec")):
diff --git a/src/servala/core/migrations/0013_add_form_config.py b/src/servala/core/migrations/0013_add_form_config.py
index 2819a6c..bd35891 100644
--- a/src/servala/core/migrations/0013_add_form_config.py
+++ b/src/servala/core/migrations/0013_add_form_config.py
@@ -15,11 +15,7 @@ class Migration(migrations.Migration):
             name="form_config",
             field=models.JSONField(
                 blank=True,
-                help_text=(
-                    "Optional custom form configuration. When provided, this configuration will "
-                    "be used to render the service form instead of auto-generating it from the OpenAPI spec. "
-                    'Format: {"fieldsets": [{"title": "Section", "fields": [{...}]}]}'
-                ),
+                help_text='Optional custom form configuration. When provided, this configuration will be used to render the service form instead of auto-generating it from the OpenAPI spec. Format: {"fieldsets": [{"title": "Section", "fields": [{...}]}]}',
                 null=True,
                 verbose_name="Form Configuration",
             ),
diff --git a/src/servala/core/schemas/form_config_schema.json b/src/servala/core/schemas/form_config_schema.json
index 15f79df..1049ed8 100644
--- a/src/servala/core/schemas/form_config_schema.json
+++ b/src/servala/core/schemas/form_config_schema.json
@@ -23,8 +23,13 @@
             "minItems": 1,
             "items": {
               "type": "object",
-              "required": ["type", "label", "controlplane_field_mapping"],
+              "required": ["name", "type", "label", "controlplane_field_mapping"],
               "properties": {
+                "name": {
+                  "type": "string",
+                  "description": "Unique field name/identifier",
+                  "pattern": "^[a-zA-Z_][a-zA-Z0-9_]*$"
+                },
                 "type": {
                   "type": "string",
                   "description": "Field type",
@@ -92,6 +97,14 @@
                     "type": "string",
                     "enum": ["email", "fqdn", "url", "ipv4", "ipv6"]
                   }
+                },
+                "generators": {
+                  "type": "array",
+                  "description": "Array of generator function names (for future use)",
+                  "items": {
+                    "type": "string",
+                    "enum": ["suggest_fqdn_from_name"]
+                  }
                 }
               }
             }
diff --git a/src/servala/frontend/templates/account/login.html b/src/servala/frontend/templates/account/login.html
index 906a9fa..f4ca590 100644
--- a/src/servala/frontend/templates/account/login.html
+++ b/src/servala/frontend/templates/account/login.html
@@ -31,9 +31,7 @@
                 </div>
                 {% for provider in socialaccount_providers %}
                     {% provider_login_url provider process=process scope=scope auth_params=auth_params as href %}
-                    <form method="post"
-                          action="{{ href }}"
-                          class="d-flex justify-content-center">
+                    <form method="post" action="{{ href }}" class="d-flex justify-content-center">
                         {% csrf_token %}
                         {{ redirect_field }}
                         <button type="submit"
diff --git a/src/servala/frontend/templates/frontend/organizations/service_offering_detail.html b/src/servala/frontend/templates/frontend/organizations/service_offering_detail.html
index 927c6e3..53e32d2 100644
--- a/src/servala/frontend/templates/frontend/organizations/service_offering_detail.html
+++ b/src/servala/frontend/templates/frontend/organizations/service_offering_detail.html
@@ -42,9 +42,7 @@
                         <i class="bi bi-exclamation-triangle-fill me-2"></i>
                         <div>
                             <strong>{% translate "Service Unavailable" %}</strong>
-                            <p class="mb-0">
-                                {% translate "We currently cannot offer this service. Please check back later or contact support for more information." %}
-                            </p>
+                            <p class="mb-0">{% translate "We currently cannot offer this service. Please check back later or contact support for more information." %}</p>
                         </div>
                     </div>
                 </div>
diff --git a/src/servala/frontend/templates/includes/control_plane_user_info.html b/src/servala/frontend/templates/includes/control_plane_user_info.html
index fdcc995..a3a27f5 100644
--- a/src/servala/frontend/templates/includes/control_plane_user_info.html
+++ b/src/servala/frontend/templates/includes/control_plane_user_info.html
@@ -4,7 +4,9 @@
         {% for info in control_plane.user_info %}
             <div class="info-item mb-3">
                 <div class="d-flex align-items-center mb-1">
-                    <small class="text-muted fw-semibold">{{ info.title }}</small>
+                    <small class="text-muted fw-semibold">
+                        {{ info.title }}
+                    </small>
                     {% if info.help_text %}
                         <i class="bi bi-info-circle ms-1 text-muted"
                            data-bs-toggle="popover"
@@ -12,7 +14,7 @@
                            data-bs-placement="top"
                            data-bs-content="{{ info.help_text }}"
                            style="cursor: help;
-                                  font-size: 0.875rem"></i>
+                                  font-size: 0.875rem;"></i>
                     {% endif %}
                 </div>
                 <div class="bg-light-subtle p-2 rounded">
diff --git a/src/servala/frontend/templates/includes/tabbed_fieldset_form.html b/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
index f9ed2a4..41f1af2 100644
--- a/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
+++ b/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
@@ -15,8 +15,7 @@
             </button>
         </div>
     {% endif %}
-    <div id="custom-form-container"
-         class="{% if form %}custom-crd-form{% else %}expert-crd-form{% endif %}">
+    <div id="custom-form-container" class="{% if form %}custom-crd-form{% else %}expert-crd-form{% endif %}">
         {% if form and form.context %}{{ form.context }}{% endif %}
         {% if form and form.get_fieldsets|length == 1 %}
             {# Single fieldset - render without tabs #}
@@ -42,7 +41,8 @@
             <ul class="nav nav-tabs" id="myTab" role="tablist">
                 {% for fieldset in form.get_fieldsets %}
                     {% if not fieldset.hidden %}
-                        <li class="nav-item" role="presentation">
+                        <li class="nav-item"
+                            role="presentation">
                             <button class="nav-link {% if forloop.first %}active{% endif %}{% if fieldset.has_mandatory %} has-mandatory{% endif %}"
                                     id="{{ fieldset.title|slugify }}-tab"
                                     data-bs-toggle="tab"
@@ -83,13 +83,12 @@
         {% endif %}
     </div>
     {% if form and expert_form %}
-        <div id="expert-form-container"
-             class="expert-crd-form"
-             style="display:none">
+        <div id="expert-form-container" class="expert-crd-form" style="display:none;">
             <ul class="nav nav-tabs" id="expertTab" role="tablist">
                 {% for fieldset in expert_form.get_fieldsets %}
                     {% if not fieldset.hidden %}
-                        <li class="nav-item" role="presentation">
+                        <li class="nav-item"
+                            role="presentation">
                             <button class="nav-link {% if forloop.first %}active{% endif %}{% if fieldset.has_mandatory %} has-mandatory{% endif %}"
                                     id="expert-{{ fieldset.title|slugify }}-tab"
                                     data-bs-toggle="tab"
@@ -130,17 +129,13 @@
         </div>
     {% endif %}
     {% if form %}
-        <input type="hidden"
-               name="active_form"
-               id="active-form-input"
-               value="custom">
+        <input type="hidden" name="active_form" id="active-form-input" value="custom">
     {% endif %}
     <div class="col-sm-12 d-flex justify-content-end">
-        {# browser form validation fails when there are fields missing/invalid that are hidden #}
-        <input class="btn btn-primary me-1 mb-1"
-               type="submit"
-               {% if form and expert_form %}formnovalidate{% endif %}
-               value="{% if form_submit_label %}{{ form_submit_label }}{% else %}{% translate "Save" %}{% endif %}" />
+        <input class="btn btn-primary me-1 mb-1" type="submit"
+            {% if form and expert_form %}formnovalidate {% endif %} {# browser form validation fails when there are fields missing/invalid that are hidden #}
+            value="{% if form_submit_label %}{{ form_submit_label }}{% else %}{% translate "Save" %}{% endif %}"
+        >
     </div>
 </form>
 {% if form %}