diff --git a/app/Filament/Admin/Resources/InternApplications/InternApplicationResource.php b/app/Filament/Admin/Resources/InternApplications/InternApplicationResource.php
index 6df8774..71abce1 100644
--- a/app/Filament/Admin/Resources/InternApplications/InternApplicationResource.php
+++ b/app/Filament/Admin/Resources/InternApplications/InternApplicationResource.php
@@ -107,13 +107,16 @@ class InternApplicationResource extends Resource
 
                                 TextInput::make('username')
                                     ->label('Kullanıcı Adı')
-                                    ->unique(ignoreRecord: true)
-                                    ->nullable(),
+                                    ->default(fn ($record) => $record?->email)
+                                    ->disabled()
+                                    ->dehydrated()
+                                    ->autocomplete('new-username'),
                                 
                                 TextInput::make('password')
                                     ->label('Şifre')
                                     ->password()
                                     ->revealable()
+                                    ->autocomplete('new-password')
                                     ->formatStateUsing(fn () => null)
                                     ->dehydrateStateUsing(fn ($state) => filled($state) ? Hash::make($state) : null)
                                     ->dehydrated(fn ($state) => filled($state))
diff --git a/app/Models/CareerApplication.php b/app/Models/CareerApplication.php
index f217ade..120f58a 100644
--- a/app/Models/CareerApplication.php
+++ b/app/Models/CareerApplication.php
@@ -37,11 +37,14 @@ class CareerApplication extends Model
     protected static function booted()
     {
         static::saving(function ($model) {
-            if ($model->type === 'internship' && !$model->certificate_code) {
-                do {
-                    $code = 'TRN-' . date('Y') . '-' . strtoupper(\Illuminate\Support\Str::random(4)) . '-' . strtoupper(\Illuminate\Support\Str::random(4));
-                } while (static::where('certificate_code', $code)->exists());
-                $model->certificate_code = $code;
+            if ($model->type === 'internship') {
+                $model->username = $model->email;
+                if (!$model->certificate_code) {
+                    do {
+                        $code = 'TRN-' . date('Y') . '-' . strtoupper(\Illuminate\Support\Str::random(4)) . '-' . strtoupper(\Illuminate\Support\Str::random(4));
+                    } while (static::where('certificate_code', $code)->exists());
+                    $model->certificate_code = $code;
+                }
             }
         });
     }
diff --git a/resources/views/front/career/intern_dashboard.blade.php b/resources/views/front/career/intern_dashboard.blade.php
index 829db8b..80d349a 100644
--- a/resources/views/front/career/intern_dashboard.blade.php
+++ b/resources/views/front/career/intern_dashboard.blade.php
@@ -495,27 +495,15 @@
                     
                     <div class="flex items-center gap-2 w-full sm:w-auto">
                       @if($intern->to_be_signed_internship_form_path)
-                      <a href="{{ Storage::disk('public')->url($intern->to_be_signed_internship_form_path) }}" target="_blank" class="px-4 py-2.5 bg-slate-850 hover:bg-slate-900 text-white font-bold rounded-xl text-xs transition-all flex items-center justify-center gap-1.5 shadow-sm">
+                      <a href="{{ Storage::disk('public')->url($intern->to_be_signed_internship_form_path) }}" target="_blank" class="px-4 py-2.5 bg-slate-800 hover:bg-slate-900 text-white font-bold rounded-xl text-xs transition-all flex items-center justify-center gap-1.5 shadow-sm">
                         <i class="uil uil-arrow-down-tray"></i>
                         <span>Görüntüle</span>
                       </a>
-                        @if(!$intern->signed_internship_form_path)
-                        <button type="button" onclick="document.getElementById('upload-form-wrapper').classList.toggle('hidden')" class="px-4 py-2.5 bg-blue-50 hover:bg-blue-100 text-blue-600 font-bold rounded-xl text-xs transition-all flex items-center justify-center gap-1.5">
-                          <i class="uil uil-edit"></i>
-                          <span>Değiştir</span>
-                        </button>
-                        @endif
-                      @else
-                      <button type="button" onclick="document.getElementById('upload-form-wrapper').classList.toggle('hidden')" class="w-full sm:w-auto px-5 py-2.5 bg-blue-600 hover:bg-blue-700 text-white font-bold rounded-xl text-sm transition-all flex items-center justify-center gap-2 shadow-md shadow-blue-500/10">
-                        <i class="uil uil-plus"></i>
-                        <span>Yükle</span>
-                      </button>
                       @endif
                     </div>
                   </div>
 
-                  @if(!$intern->signed_internship_form_path)
-                  <div id="upload-form-wrapper" class="{{ $intern->to_be_signed_internship_form_path ? 'hidden' : '' }} mt-4 border-t border-slate-100 pt-4">
+                  <div id="upload-form-wrapper" class="mt-4 border-t border-slate-100 pt-4">
                     <form action="{{ route('intern.upload-form') }}" method="POST" enctype="multipart/form-data" class="space-y-4">
                       @csrf
 
@@ -576,11 +564,11 @@
                         <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
                           <div>
                             <label for="internship_start_date" class="block text-xs font-extrabold text-slate-500 uppercase tracking-wider mb-1.5">Staj Başlangıç Tarihi</label>
-                            <input type="date" name="internship_start_date" id="internship_start_date" onchange="calculateEndDateFrontend()" oninput="calculateEndDateFrontend()" required value="{{ $intern->internship_start_date }}" class="w-full px-4 py-3 rounded-xl border border-slate-200 focus:border-blue-400 focus:ring-1 focus:ring-blue-400 focus:outline-none text-sm font-semibold text-slate-700 bg-white transition-all" />
+                            <input type="date" name="internship_start_date" id="internship_start_date" onchange="calculateEndDateFrontend()" oninput="calculateEndDateFrontend()" required value="{{ $intern->internship_start_date }}" @if($intern->status !== 'pending') disabled @endif class="w-full px-4 py-3 rounded-xl border border-slate-200 focus:border-blue-400 focus:ring-1 focus:ring-blue-400 focus:outline-none text-sm font-semibold text-slate-700 bg-white transition-all disabled:bg-slate-50 disabled:text-slate-500 disabled:cursor-not-allowed" />
                           </div>
                           <div>
                             <label for="internship_total_days" class="block text-xs font-extrabold text-slate-500 uppercase tracking-wider mb-1.5">Staj Süresi (İş Günü)</label>
-                            <input type="number" name="internship_total_days" id="internship_total_days" onchange="calculateEndDateFrontend()" oninput="calculateEndDateFrontend()" min="1" required value="{{ $intern->internship_total_days }}" placeholder="Örn: 20" class="w-full px-4 py-3 rounded-xl border border-slate-200 focus:border-blue-400 focus:ring-1 focus:ring-blue-400 focus:outline-none text-sm font-semibold text-slate-700 bg-white transition-all" />
+                            <input type="number" name="internship_total_days" id="internship_total_days" onchange="calculateEndDateFrontend()" oninput="calculateEndDateFrontend()" min="1" required value="{{ $intern->internship_total_days }}" placeholder="Örn: 20" @if($intern->status !== 'pending') disabled @endif class="w-full px-4 py-3 rounded-xl border border-slate-200 focus:border-blue-400 focus:ring-1 focus:ring-blue-400 focus:outline-none text-sm font-semibold text-slate-700 bg-white transition-all disabled:bg-slate-50 disabled:text-slate-500 disabled:cursor-not-allowed" />
                           </div>
                         </div>
                         <div>
@@ -589,6 +577,7 @@
                         </div>
                       </div>
 
+                      @if($intern->status === 'pending')
                       <div class="relative border-2 border-dashed border-slate-200 hover:border-blue-400 rounded-2xl p-6 transition-all bg-white flex flex-col items-center justify-center text-center cursor-pointer group">
                         <input type="file" name="internship_form" id="internship_form" accept=".pdf,.docx,.jpg,.png,.jpeg" onchange="handleFileSelected(this)" class="absolute inset-0 w-full h-full opacity-0 cursor-pointer z-10" />
                         <i class="uil uil-cloud-upload text-4xl text-slate-400 group-hover:text-blue-500 transition-colors mb-2"></i>
@@ -603,9 +592,13 @@
                           <span>Dosyayı Kaydet</span>
                         </button>
                       </div>
+                      @else
+                      <div class="p-4 bg-slate-50 border border-slate-100 rounded-2xl text-center text-xs text-slate-500 font-semibold">
+                        <i class="uil uil-lock-alt text-base mr-1"></i> Başvurunuz bekleme aşamasında (beklemede) olmadığı için staj bilgilerinizi ve dosyanızı güncelleyemezsiniz.
+                      </div>
+                      @endif
                     </form>
                   </div>
-                  @endif
                 </div>
 
                 <!-- Signed Internship Form Card -->