diff --git a/app/modules/credential_vault/templates/credential_vault/form.html b/app/modules/credential_vault/templates/credential_vault/form.html
index 905f509..fa78c29 100644
--- a/app/modules/credential_vault/templates/credential_vault/form.html
+++ b/app/modules/credential_vault/templates/credential_vault/form.html
@@ -4,13 +4,13 @@
   <div class="mb-5">
     <h1 class="text-2xl font-bold">Add encrypted credential</h1>
     {% if selected_registration %}
-    <p class="mt-1 text-sm text-slate-600">Linked to registration <strong>{{ selected_registration.registration_number }}</strong>. Secrets remain encrypted and reveal access is audited.</p>
+    <p class="mt-1 text-sm text-slate-600">Linked to registration <strong>{{ selected_registration.registration_number }}</strong>. You can save multiple independent portal credentials for the same registration (for example Income Tax Portal and TRACES for one TAN). Secrets remain encrypted and reveal access is audited.</p>
     {% endif %}
   </div>
   <form method="post" class="grid gap-4 rounded-xl bg-white p-6 shadow sm:grid-cols-2">
     <input type="hidden" name="csrf_token" value="{{ csrf_token }}">
     <label class="sm:col-span-2">Title<input required name="title" class="mt-1 w-full rounded-lg border p-2" placeholder="e.g. GST Portal - Main Login"></label>
-    <label>Credential type
+    <label>Portal / credential type
       <select name="category" class="mt-1 w-full rounded-lg border p-2">
         <option value="gst_portal">GST Portal</option>
         <option value="income_tax_portal">Income Tax Portal</option>
@@ -26,6 +26,7 @@
         <option value="digital_signature">Digital signature</option>
         <option value="other">Other</option>
       </select>
+      <span class="mt-1 block text-xs text-slate-500">Each portal is stored as a separate vault entry. Adding TRACES does not replace the Income Tax Portal credential for the same TAN.</span>
     </label>
     <label>Sensitivity<select name="sensitivity" class="mt-1 w-full rounded-lg border p-2"><option>high</option><option>critical</option><option>standard</option></select></label>
     <label>Client
diff --git a/app/modules/registrations/templates/registrations/client.html b/app/modules/registrations/templates/registrations/client.html
index 80d02e4..15a909b 100644
--- a/app/modules/registrations/templates/registrations/client.html
+++ b/app/modules/registrations/templates/registrations/client.html
@@ -1 +1 @@
-{% extends "ui/templates/base/layout.html" %}{% block content %}<div class="space-y-6"><div><h1 class="text-2xl font-semibold">{{client.client_name}} — Registrations</h1><a class="text-sm text-brand-600" href="/registrations">← Dashboard</a></div><div class="grid gap-4 lg:grid-cols-2"><div class="rounded-xl border bg-white p-4"><h2 class="font-semibold">Registration records</h2>{% for r,t in registrations %}<div class="border-b py-3"><div class="flex flex-wrap items-start justify-between gap-2"><div><div class="font-medium">{{t.name}} — {{r.registration_number}}</div><div class="text-sm text-slate-500">Valid until: {{r.valid_until or '—'}} · Next action: {{r.next_action_date or '—'}} · {{r.status}}</div></div><div class="flex flex-wrap gap-2">{% if can_manage_vault %}<a class="rounded border border-brand-200 bg-brand-50 px-2.5 py-1 text-xs font-semibold text-brand-700" href="/credential-vault/new?client_id={{ client.id }}&registration_id={{ r.id }}">+ Credential</a>{% endif %}</div></div>{% set vault_entries = vault_by_registration.get(r.id, []) if vault_by_registration else [] %}{% if vault_entries %}<div class="mt-2 flex flex-wrap gap-2">{% for v in vault_entries %}<a href="/credential-vault/{{ v.id }}" class="rounded-full bg-slate-100 px-2.5 py-1 text-xs font-semibold text-slate-700">🔐 {{ v.title }}</a>{% endfor %}</div>{% endif %}</div>{% else %}<p class="py-4 text-slate-500">No records.</p>{% endfor %}</div><div class="rounded-xl border bg-white p-4"><h2 class="font-semibold">Related persons and DSC</h2>{% for p in people %}<div class="border-b py-2"><b>{{p.full_name}}</b> — {{p.person_type}}{% if p.din %} · DIN {{p.din}}{% endif %}</div>{% endfor %}{% for d,p in dscs %}<div class="border-b py-2">DSC: {{p.full_name}} · expires {{d.expires_on}} · {{d.status}}</div>{% endfor %}</div></div>{% if can_manage %}<div class="grid gap-4 xl:grid-cols-3"><form method="post" action="/registrations/clients/{{client.id}}/people" class="space-y-2 rounded-xl border bg-white p-4"><h2 class="font-semibold">Add Related Person</h2><input type="hidden" name="csrf_token" value="{{csrf_token}}"><select class="w-full rounded border p-2" name="person_type"><option>Director</option><option>Partner</option><option>Designated Partner</option><option>Proprietor</option><option>Trustee</option><option>Karta</option><option>Authorised Signatory</option></select><input class="w-full rounded border p-2" name="full_name" placeholder="Full name" required><input class="w-full rounded border p-2" name="designation" placeholder="Designation"><input class="w-full rounded border p-2" name="pan" placeholder="PAN"><input class="w-full rounded border p-2" name="din" placeholder="DIN"><input class="w-full rounded border p-2" type="date" name="date_of_birth"><input class="w-full rounded border p-2" type="date" name="appointment_date"><input class="w-full rounded border p-2" name="mobile" placeholder="Mobile"><input class="w-full rounded border p-2" name="email" placeholder="Email"><label><input type="checkbox" name="authorised_signatory"> Authorised signatory</label><button class="rounded bg-brand-600 px-3 py-2 text-white">Add Person</button></form><form method="post" action="/registrations/clients/{{client.id}}/records" class="space-y-2 rounded-xl border bg-white p-4"><h2 class="font-semibold">Add Registration</h2><input type="hidden" name="csrf_token" value="{{csrf_token}}"><select class="w-full rounded border p-2" name="registration_type_id">{% for x in types %}<option value="{{x.id}}">{{x.name}}</option>{% endfor %}</select><select class="w-full rounded border p-2" name="related_person_id"><option value="">Client/entity</option>{% for p in people %}<option value="{{p.id}}">{{p.full_name}}</option>{% endfor %}</select><input class="w-full rounded border p-2" name="registration_number" placeholder="Registration number" required><input class="w-full rounded border p-2" name="jurisdiction" placeholder="Jurisdiction"><input class="w-full rounded border p-2" type="date" name="issue_date"><input class="w-full rounded border p-2" type="date" name="effective_from"><label class="text-xs">Valid until</label><input class="w-full rounded border p-2" type="date" name="valid_until"><label class="text-xs">Next update/confirmation</label><input class="w-full rounded border p-2" type="date" name="next_action_date"><select class="w-full rounded border p-2" name="lifecycle_rule_id"><option value="">Automatic rule</option>{% for r in rules %}<option value="{{r.id}}">Rule {{r.id}} — {{r.cycle_type}}</option>{% endfor %}</select><select class="w-full rounded border p-2" name="assigned_consultant_id"><option value="">No consultant</option>{% for c in consultants %}<option value="{{c.id}}">{{c.display_name or c.name or ('Consultant #' ~ c.id)}}</option>{% endfor %}</select><label><input type="checkbox" name="auto_create_task" checked> Auto-create renewal work</label><button class="rounded bg-brand-600 px-3 py-2 text-white">Add Registration</button></form><form method="post" action="/registrations/clients/{{client.id}}/dsc" class="space-y-2 rounded-xl border bg-white p-4"><h2 class="font-semibold">Add DSC</h2><input type="hidden" name="csrf_token" value="{{csrf_token}}"><select class="w-full rounded border p-2" name="related_person_id" required>{% for p in people %}<option value="{{p.id}}">{{p.full_name}}</option>{% endfor %}</select><input class="w-full rounded border p-2" name="certificate_serial_number" placeholder="Certificate serial"><input class="w-full rounded border p-2" name="provider" placeholder="Provider"><input class="w-full rounded border p-2" name="token_make" placeholder="Token make"><input class="w-full rounded border p-2" name="class_type" placeholder="Class/type"><input class="w-full rounded border p-2" type="date" name="issued_on"><label class="text-xs">Expiry date</label><input class="w-full rounded border p-2" type="date" name="expires_on" required><input class="w-full rounded border p-2" name="custody_location" placeholder="Custody location"><select class="w-full rounded border p-2" name="renewal_responsibility"><option value="firm">Firm</option><option value="client">Client</option><option value="consultant">Consultant</option></select><button class="rounded bg-brand-600 px-3 py-2 text-white">Add DSC</button></form></div>{% endif %}</div>{% endblock %}
+{% extends "ui/templates/base/layout.html" %}{% block content %}<div class="space-y-6"><div><h1 class="text-2xl font-semibold">{{client.client_name}} — Registrations</h1><a class="text-sm text-brand-600" href="/registrations">← Dashboard</a></div><div class="grid gap-4 lg:grid-cols-2"><div class="rounded-xl border bg-white p-4"><h2 class="font-semibold">Registration records</h2>{% for r,t in registrations %}<div class="border-b py-3"><div class="flex flex-wrap items-start justify-between gap-2"><div><div class="font-medium">{{t.name}} — {{r.registration_number}}</div><div class="text-sm text-slate-500">Valid until: {{r.valid_until or '—'}} · Next action: {{r.next_action_date or '—'}} · {{r.status}}</div></div>{% set vault_entries = vault_by_registration.get(r.id, []) if vault_by_registration else [] %}<div class="flex flex-wrap gap-2">{% if can_manage_vault %}<a class="rounded border border-brand-200 bg-brand-50 px-2.5 py-1 text-xs font-semibold text-brand-700" href="/credential-vault/new?client_id={{ client.id }}&registration_id={{ r.id }}">{% if vault_entries %}+ Add Another Credential{% else %}+ Add Credential{% endif %}</a>{% endif %}</div></div>{% if vault_entries %}<div class="mt-3 rounded-lg border border-slate-200 bg-slate-50 p-2.5"><div class="mb-2 text-xs font-semibold uppercase tracking-wide text-slate-500">Portal Credentials ({{ vault_entries|length }})</div><div class="grid gap-2">{% for v in vault_entries %}{% set category_label = {'gst_portal':'GST Portal','income_tax_portal':'Income Tax Portal','traces_tds':'TRACES / TDS','mca_portal':'MCA Portal','eway_bill':'E-Way Bill','einvoice':'E-Invoice','government_portal':'Other Government Portal','banking':'Banking','email':'Email','software':'Software','api_key':'API Key','digital_signature':'Digital Signature','other':'Other'}.get(v.category, (v.category or 'Credential')|replace('_',' ')|title) %}<a href="/credential-vault/{{ v.id }}" class="flex flex-wrap items-center justify-between gap-2 rounded-md border bg-white px-3 py-2 text-sm hover:border-brand-300 hover:bg-brand-50"><span><span class="font-semibold text-slate-800">{{ category_label }}</span><span class="ml-2 text-slate-600">{{ v.title }}</span>{% if v.reference_number %}<span class="ml-2 text-xs text-slate-400">· {{ v.reference_number }}</span>{% endif %}</span><span class="rounded-full px-2 py-0.5 text-xs font-semibold {% if v.status == 'active' %}bg-emerald-100 text-emerald-700{% else %}bg-slate-200 text-slate-600{% endif %}">{{ v.status|title }}</span></a>{% endfor %}</div></div>{% endif %}</div>{% else %}<p class="py-4 text-slate-500">No records.</p>{% endfor %}</div><div class="rounded-xl border bg-white p-4"><h2 class="font-semibold">Related persons and DSC</h2>{% for p in people %}<div class="border-b py-2"><b>{{p.full_name}}</b> — {{p.person_type}}{% if p.din %} · DIN {{p.din}}{% endif %}</div>{% endfor %}{% for d,p in dscs %}<div class="border-b py-2">DSC: {{p.full_name}} · expires {{d.expires_on}} · {{d.status}}</div>{% endfor %}</div></div>{% if can_manage %}<div class="grid gap-4 xl:grid-cols-3"><form method="post" action="/registrations/clients/{{client.id}}/people" class="space-y-2 rounded-xl border bg-white p-4"><h2 class="font-semibold">Add Related Person</h2><input type="hidden" name="csrf_token" value="{{csrf_token}}"><select class="w-full rounded border p-2" name="person_type"><option>Director</option><option>Partner</option><option>Designated Partner</option><option>Proprietor</option><option>Trustee</option><option>Karta</option><option>Authorised Signatory</option></select><input class="w-full rounded border p-2" name="full_name" placeholder="Full name" required><input class="w-full rounded border p-2" name="designation" placeholder="Designation"><input class="w-full rounded border p-2" name="pan" placeholder="PAN"><input class="w-full rounded border p-2" name="din" placeholder="DIN"><input class="w-full rounded border p-2" type="date" name="date_of_birth"><input class="w-full rounded border p-2" type="date" name="appointment_date"><input class="w-full rounded border p-2" name="mobile" placeholder="Mobile"><input class="w-full rounded border p-2" name="email" placeholder="Email"><label><input type="checkbox" name="authorised_signatory"> Authorised signatory</label><button class="rounded bg-brand-600 px-3 py-2 text-white">Add Person</button></form><form method="post" action="/registrations/clients/{{client.id}}/records" class="space-y-2 rounded-xl border bg-white p-4"><h2 class="font-semibold">Add Registration</h2><input type="hidden" name="csrf_token" value="{{csrf_token}}"><select class="w-full rounded border p-2" name="registration_type_id">{% for x in types %}<option value="{{x.id}}">{{x.name}}</option>{% endfor %}</select><select class="w-full rounded border p-2" name="related_person_id"><option value="">Client/entity</option>{% for p in people %}<option value="{{p.id}}">{{p.full_name}}</option>{% endfor %}</select><input class="w-full rounded border p-2" name="registration_number" placeholder="Registration number" required><input class="w-full rounded border p-2" name="jurisdiction" placeholder="Jurisdiction"><input class="w-full rounded border p-2" type="date" name="issue_date"><input class="w-full rounded border p-2" type="date" name="effective_from"><label class="text-xs">Valid until</label><input class="w-full rounded border p-2" type="date" name="valid_until"><label class="text-xs">Next update/confirmation</label><input class="w-full rounded border p-2" type="date" name="next_action_date"><select class="w-full rounded border p-2" name="lifecycle_rule_id"><option value="">Automatic rule</option>{% for r in rules %}<option value="{{r.id}}">Rule {{r.id}} — {{r.cycle_type}}</option>{% endfor %}</select><select class="w-full rounded border p-2" name="assigned_consultant_id"><option value="">No consultant</option>{% for c in consultants %}<option value="{{c.id}}">{{c.display_name or c.name or ('Consultant #' ~ c.id)}}</option>{% endfor %}</select><label><input type="checkbox" name="auto_create_task" checked> Auto-create renewal work</label><button class="rounded bg-brand-600 px-3 py-2 text-white">Add Registration</button></form><form method="post" action="/registrations/clients/{{client.id}}/dsc" class="space-y-2 rounded-xl border bg-white p-4"><h2 class="font-semibold">Add DSC</h2><input type="hidden" name="csrf_token" value="{{csrf_token}}"><select class="w-full rounded border p-2" name="related_person_id" required>{% for p in people %}<option value="{{p.id}}">{{p.full_name}}</option>{% endfor %}</select><input class="w-full rounded border p-2" name="certificate_serial_number" placeholder="Certificate serial"><input class="w-full rounded border p-2" name="provider" placeholder="Provider"><input class="w-full rounded border p-2" name="token_make" placeholder="Token make"><input class="w-full rounded border p-2" name="class_type" placeholder="Class/type"><input class="w-full rounded border p-2" type="date" name="issued_on"><label class="text-xs">Expiry date</label><input class="w-full rounded border p-2" type="date" name="expires_on" required><input class="w-full rounded border p-2" name="custody_location" placeholder="Custody location"><select class="w-full rounded border p-2" name="renewal_responsibility"><option value="firm">Firm</option><option value="client">Client</option><option value="consultant">Consultant</option></select><button class="rounded bg-brand-600 px-3 py-2 text-white">Add DSC</button></form></div>{% endif %}</div>{% endblock %}