diff --git a/resources/views/form/rapport-team4/1748864910-695ca2a4-08ff-49be-b2b5-c4087a461edd.blade.php b/resources/views/form/rapport-team4/1748864910-695ca2a4-08ff-49be-b2b5-c4087a461edd.blade.php
index 5f945218..7c2cf148 100644
--- a/resources/views/form/rapport-team4/1748864910-695ca2a4-08ff-49be-b2b5-c4087a461edd.blade.php
+++ b/resources/views/form/rapport-team4/1748864910-695ca2a4-08ff-49be-b2b5-c4087a461edd.blade.php
@@ -115,11 +115,14 @@ $brandData = [
                                     @case('email')
                                     @case('tel')
                                     @case('date')
-                                    <input type="{{$question->type}}" id="field-{{$question->code}}"
-                                        name="{{$question->code}}" class="form-control"
-                                        {{$question->required == 'no'?'required':'' }}
-                                        value="{{isset($question->value)?$question->value:''}}">
-                                    @break
+                                        <input type="{{$question->type}}"
+                                            id="field-{{$question->code}}"
+                                            name="{{$question->code}}"
+                                            class="form-control"
+                                            {{$question->required == 'yes'?'required':'' }}
+                                            value="{{isset($question->value)?$question->value:''}}"
+                                            {{$question->code == 'legacy_code' ? 'readonly' : ''}}>
+                                        @break
                                     @case('number')
                                     <input type="{{$question->type}}" min="0" max="9999999999" step="1"
                                         id="field-{{$question->code}}" name="{{$question->code}}" class="form-control"
@@ -135,9 +138,15 @@ $brandData = [
                                     <select class="form-control" id="field-{{ $question->code }}" name="{{ $question->code }}" {{ $question->required == 'yes' ? 'required' : '' }}>
                                             <option value=""> -- Select -- </option>
                                             @foreach ($question->options as $option)
-                                            <option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'msl_code= ' . $option->contact->msl_code . ' ' : '' }}  {{ $question->code == 'contact_id' ? 'speciality= ' . (isset($option->contact->speciality) ? $option->contact->speciality :'') . ' ' : '' }} >
-                                                {{ $option->display }}
-                                            </option>
+                                            <option value="{{ $option->value }}"
+                                            {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}
+                                            @if($question->code == 'contact_id')
+                                                legacy_code="{{ isset($option->contact->legacy_code) ? e($option->contact->legacy_code) : '' }}"
+                                                speciality="{{ isset($option->contact->speciality) ? e($option->contact->speciality) : '' }}"
+                                            @endif
+                                        >
+                                            {{ $option->display }}
+                                        </option>
 
                                             @endforeach
                                         </select>
@@ -270,13 +279,15 @@ $brandData = [
                     for (let itm of data) {
                         if(itm.contact.c2c == 'Yes') {
                             $('#field-contact_id').append($("<option></option>").attr("value",
-                            itm.value).text(itm.display).attr("speciality", itm.contact.speciality));
+                            itm.value).text(itm.display)
+                            .attr("speciality", itm.contact.speciality || "")
+                            .attr("legacy_code", itm.contact.legacy_code || ""));
                         }
                     }
 
                     $('#field-contact_id').change(function() {
-                        $('#field-speciality').val($('option:selected', this).attr(
-                            'speciality'))
+                        let speciality = $('option:selected', this).attr('speciality') || '';
+                        $('#field-speciality').val(speciality.trim());
                     })
 
                 },
@@ -286,13 +297,19 @@ $brandData = [
         })
 
         $('#field-contact_id').change(function() {
-                        $('#field-speciality').val($('option:selected', this).attr('speciality'))
+                        let speciality = $('option:selected', this).attr('speciality') || '';
+                         $('#field-speciality').val(speciality.trim());
                     })
         
         $('#field-contact_id').change(function() {
-               		 $('#field-legacy_code').val($('option:selected', this).attr('msl_code'))
+               		 $('#field-legacy_code').val($('option:selected', this).attr('legacy_code') || '')
         })
 
+        // Read-only fields: keep them enabled so their values are submitted normally.
+        $('#field-msl_code').prop('readonly', true);
+        $('#field-speciality').prop('readonly', true);
+        $('#field-total_units').prop('readonly', true);
+
         $('#field-chemist_name').parent().hide();
         $("#field-chemist_name").prop({"required":false});
         // $("#field-speciality").parent().hide();