diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php
index b6a43f6..6bd6bfb 100644
--- a/app/Http/Controllers/PermohonanController.php
+++ b/app/Http/Controllers/PermohonanController.php
@@ -108,7 +108,6 @@
         public function update(PermohonanRequest $request, $id)
         {
             $validate = $request->validated();
-
             if ($validate) {
                 try {
                     // Update in database
@@ -116,6 +115,7 @@
                     if ($permohonan->status == 'revisi') {
                         $validate['status'] = 'order';
                     }
+
                     $permohonan->update($validate);
                     return redirect()
                         ->route('permohonan.index')->with('success', 'Permohonan updated successfully');
diff --git a/app/Http/Requests/PermohonanRequest.php b/app/Http/Requests/PermohonanRequest.php
index 9dddc42..3f2f252 100644
--- a/app/Http/Requests/PermohonanRequest.php
+++ b/app/Http/Requests/PermohonanRequest.php
@@ -17,7 +17,7 @@
                 'nomor_registrasi'          => 'nullable|string|max:10',
                 'tanggal_permohonan'        => 'nullable|date',
                 'user_id'                   => 'nullable|exists:users,id',
-                'branch_id'                 => 'required|exists:branches,id',
+                'branch_id'                 => 'nullable|exists:branches,id',
                 'tujuan_penilaian_id'       => 'required|exists:tujuan_penilaian,id',
                 'debiture_id'               => 'required|exists:debitures,id',
                 'status'                    => 'nullable|string',
diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php
index 223194a..1336330 100644
--- a/resources/views/permohonan/form.blade.php
+++ b/resources/views/permohonan/form.blade.php
@@ -34,6 +34,7 @@
                         <form action="{{ isset($permohonan->id) ? route('permohonan.update', $permohonan) : route('permohonan.store') }}" method="POST" class="grid gap-5" enctype="multipart/form-data">
                             @if(isset($permohonan->id))
                                 @method('PUT')
+                                <input type="hidden" name="id" value="{{ $permohonan->id }}">
                             @endif
                             @csrf
 
@@ -52,19 +53,14 @@
                                     Tujuan Penilaian
                                 </label>
                                 <div class="flex flex-wrap items-baseline w-full">
-                                    <select class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror" name="tujuan_penilaian_id" id="tujuan_penilaian_id">
+                                    <select class="input tomselect w-full @error('tujuan_penilaian_id') border-danger bg-danger-light @enderror" name="tujuan_penilaian_id" id="tujuan_penilaian_id">
                                         <option value="">Pilih Tujuan Penilaian</option>
                                         @if(isset($tujuanPenilaian))
                                             @foreach($tujuanPenilaian as $row)
-                                                @if(isset($permohonan))
-                                                    <option value="{{ $row->id }}" {{ isset($permohonan->tujuan_penilaian_id) && $permohonan->tujuan_penilaian_id == $row->id?'selected' : '' }}>
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @else
-                                                    <option value="{{ $row->id }}">
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @endif
+                                                <option value="{{ $row->id }}"
+                                                    {{ (old('tujuan_penilaian_id') == $row->id) || (isset($permohonan) && $permohonan->tujuan_penilaian_id == $row->id) ? 'selected' : '' }}>
+                                                    {{ $row->name }}
+                                                </option>
                                             @endforeach
                                         @endif
                                     </select>
@@ -83,15 +79,10 @@
                                         <option value="">Pilih Fasilitas Kredit</option>
                                         @if(isset($fasilitasKredit))
                                             @foreach($fasilitasKredit as $row)
-                                                @if(isset($permohonan))
-                                                    <option value="{{ $row->id }}" {{ isset($permohonan->jenis_fasilitas_kredit_id) && $permohonan->jenis_fasilitas_kredit_id == $row->id ?'selected' : '' }}>
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @else
-                                                    <option value="{{ $row->id }}">
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @endif
+                                                <option value="{{ $row->id }}"
+                                                    {{ (old('jenis_fasilitas_kredit_id') == $row->id) || (isset($permohonan) && $permohonan->jenis_fasilitas_kredit_id == $row->id) ? 'selected' : '' }}>
+                                                    {{ $row->name }}
+                                                </option>
                                             @endforeach
                                         @endif
                                     </select>
@@ -107,18 +98,13 @@
                                 </label>
                                 <div class="flex flex-wrap items-baseline w-full">
                                     <select class="input tomselect w-full @error('nilai_plafond_id') border-danger bg-danger-light @enderror" name="nilai_plafond_id" id="nilai_plafond_id">
-                                        <option value="">Pilih Nilai Flafond</option>
+                                        <option value="">Pilih Nilai Plafond</option>
                                         @if(isset($plafond))
                                             @foreach($plafond as $row)
-                                                @if(isset($permohonan))
-                                                    <option value="{{ $row->id }}" {{ isset($permohonan->nilai_plafond_id) && $permohonan->nilai_plafond_id == $row->id ?'selected' : '' }}>
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @else
-                                                    <option value="{{ $row->id }}">
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @endif
+                                                <option value="{{ $row->id }}"
+                                                    {{ (old('nilai_plafond_id') == $row->id) || (isset($permohonan) && $permohonan->nilai_plafond_id == $row->id) ? 'selected' : '' }}>
+                                                    {{ $row->name }}
+                                                </option>
                                             @endforeach
                                         @endif
                                     </select>
@@ -135,8 +121,8 @@
                                 <div class="flex flex-wrap items-baseline w-full">
                                     <select class="input tomselect w-full @error('status_bayar') border-danger bg-danger-light @enderror" name="status_bayar" id="status_bayar">
                                         <option value="">Pilih Status Bayar</option>
-                                        <option {{ $permohonan->status_bayar=="sudah_bayar" ? 'selected' : '' }} value="sudah_bayar">Sudah Bayar</option>
-                                        <option {{ $permohonan->status_bayar=="belum_bayar" ? 'selected' : '' }} value="belum_bayar">Belum Bayar</option>
+                                        <option value="sudah_bayar" {{ (old('status_bayar') == 'sudah_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'sudah_bayar') ? 'selected' : '' }}>Sudah Bayar</option>
+                                        <option value="belum_bayar" {{ (old('status_bayar') == 'belum_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'belum_bayar') ? 'selected' : '' }}>Belum Bayar</option>
                                     </select>
                                     @error('status_bayar')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
@@ -149,12 +135,16 @@
                                     Nilai NJOP
                                 </label>
                                 <div class="flex flex-wrap items-baseline w-full">
-                                    <input class="input  @error('nilai_njop') border-danger bg-danger-light @enderror" type="text" name="nilai_njop" value="{{ $permohonan->nilai_njop ?? '' }}">
+                                    <input class="input @error('nilai_njop') border-danger bg-danger-light @enderror"
+                                           type="text"
+                                           name="nilai_njop"
+                                           value="{{ old('nilai_njop', $permohonan->nilai_njop ?? '') }}">
                                     @error('nilai_njop')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
                                     @enderror
                                 </div>
                             </div>
+
                             @if($permohonan->status=='revisi')
                                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                                     Catatan : <br>