diff --git a/app/modules/clients/templates/clients/partials/form.html b/app/modules/clients/templates/clients/partials/form.html
index cae98c4..f0e88f8 100644
--- a/app/modules/clients/templates/clients/partials/form.html
+++ b/app/modules/clients/templates/clients/partials/form.html
@@ -19,7 +19,7 @@
       </div>
 
       <div>
-        <label class="block text-sm font-medium text-slate-700">Client Type</label>
+        <label class="block text-sm font-medium text-slate-700">Legal Constitution</label>
         <select name="client_type" class="mt-1 w-full rounded-xl border border-slate-300 px-4 py-2 text-sm">
           {% for opt in client_types %}
           <option value="{{ opt }}" {% if (form_data.client_type or (row.client_type if is_edit else 'Other')) == opt %}selected{% endif %}>{{ opt }}</option>
@@ -87,15 +87,9 @@
         <input name="contact_person_designation" value="{{ form_data.contact_person_designation or (row.contact_person_designation if is_edit else '') }}" class="mt-1 w-full rounded-xl border border-slate-300 px-4 py-2 text-sm">
       </div>
 
-      <div>
-        <label class="block text-sm font-medium text-slate-700">Client Category</label>
-        <select name="client_category" class="mt-1 w-full rounded-xl border border-slate-300 px-4 py-2 text-sm">
-          <option value="">-- Select --</option>
-          {% for opt in client_categories %}
-          <option value="{{ opt }}" {% if (form_data.client_category or (row.client_category if is_edit else '')) == opt %}selected{% endif %}>{{ opt }}</option>
-          {% endfor %}
-        </select>
-      </div>
+      {# Legacy client_category is retained as a hidden compatibility value.
+         Service selection belongs to the engagement workflow. #}
+      <input type="hidden" name="client_category" value="{{ form_data.client_category or (row.client_category if is_edit else '') }}">
 
       <div>
         <label class="block text-sm font-medium text-slate-700">Risk Category</label>
@@ -181,15 +175,8 @@
       </div>
 
       {% if form_mode == 'firm_admin' %}
-      <div>
-        <label class="block text-sm font-medium text-slate-700">Audit Firm</label>
-        <div class="mt-1 rounded-xl border border-slate-300 bg-slate-50 px-4 py-2 text-sm text-slate-700">
-          {% for t in form_options.tenants %}
-            {{ t.name }}
-          {% endfor %}
-        </div>
-        <input type="hidden" name="tenant_id" value="{{ form_data.tenant_id or (row.tenant_id if is_edit else form_options.active_tenant_id) }}">
-      </div>
+      {# Firm Admin is always scoped by the active tenant in the shared header. #}
+      <input type="hidden" name="tenant_id" value="{{ form_data.tenant_id or (row.tenant_id if is_edit else form_options.active_tenant_id) }}">
 
       <div>
         <label class="block text-sm font-medium text-slate-700">Branch</label>
@@ -384,13 +371,9 @@
       </div>
       {% else %}
       <div class="border-t border-slate-200 pt-4">
-        <div class="rounded-2xl border border-sky-200 bg-sky-50 px-4 py-4">
-          <h4 class="text-sm font-semibold text-sky-950">Services and AQMM requirements are configured at engagement level</h4>
-          <p class="mt-1 text-sm leading-6 text-sky-800">
-            Create the client master first. After creation, assign one or more firm-enabled services through an engagement.
-            The existing Assurance / Non-Assurance classification will continue to activate the applicable acceptance,
-            independence, conflict, engagement-letter and other AQMM requirements.
-          </p>
+        <div class="rounded-xl border border-sky-200 bg-sky-50 p-4 text-sm text-sky-900">
+          <div class="font-semibold">Services and AQMM requirements are configured at engagement level</div>
+          <p class="mt-2 leading-6">Create the client master first. After creation, assign one or more firm-enabled services through an engagement. The existing Assurance / Non-Assurance classification will continue to activate the applicable acceptance, independence, conflict, engagement-letter and other AQMM requirements.</p>
         </div>
       </div>
       {% endif %}