diff --git a/app/Helpers/LegacyEncryption.php b/app/Helpers/LegacyEncryption.php
index 952576a..fafe6ea 100644
--- a/app/Helpers/LegacyEncryption.php
+++ b/app/Helpers/LegacyEncryption.php
@@ -28,7 +28,10 @@ class LegacyEncryption
         }
 
         $this->key = trim(file_get_contents($keyPath));
-        $this->iv = config('intaleq.legacy_iv', '');
+        $this->iv = config('intaleq.legacy_iv', env('initializationVector', ''));
+        if (strlen($this->iv) !== 16) {
+            $this->iv = str_pad($this->iv, 16, "\0");
+        }
     }
 
     /**
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 9a45297..c5b3fa2 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -561,7 +561,7 @@ class AuthController extends Controller
         }
 
         // Security Check: Verify fingerprint matches stored token
-        $storedToken = DB::connection('primary')->table('captainToken')
+        $storedToken = DB::connection('primary')->table('driverToken')
             ->where('captain_id', $driver->id)
             ->first();
 
@@ -571,14 +571,14 @@ class AuthController extends Controller
                 return $this->failure('Security mismatch: Invalid device fingerprint', 403);
             }
             // Update fingerprint and token
-            DB::connection('primary')->table('captainToken')->where('captain_id', $driver->id)
+            DB::connection('primary')->table('driverToken')->where('captain_id', $driver->id)
                 ->update([
                     'fingerPrint' => $request->input('fingerPrint'),
                     'token' => $request->input('fcm_token'),
                     'updated_at' => now()
                 ]);
         } else {
-            DB::connection('primary')->table('captainToken')->insert([
+            DB::connection('primary')->table('driverToken')->insert([
                 'captain_id' => $driver->id,
                 'fingerPrint' => $request->input('fingerPrint'),
                 'token' => $request->input('fcm_token'),
diff --git a/app/Services/LegacyEncryption.php b/app/Services/LegacyEncryption.php
index 6fb2972..4a01eee 100644
--- a/app/Services/LegacyEncryption.php
+++ b/app/Services/LegacyEncryption.php
@@ -20,6 +20,9 @@ class LegacyEncryption
         }
 
         $this->iv = config('intaleq.legacy_iv', env('initializationVector', ''));
+        if (strlen($this->iv) !== 16) {
+            $this->iv = str_pad($this->iv, 16, "\0");
+        }
 
         if (strlen($this->key) !== 32) {
             // Log warning or throw error in production