diff --git a/siro_driver/lib/controller/functions/ocr_controller.dart b/siro_driver/lib/controller/functions/ocr_controller.dart
index 2099897c..8658c59a 100755
--- a/siro_driver/lib/controller/functions/ocr_controller.dart
+++ b/siro_driver/lib/controller/functions/ocr_controller.dart
@@ -558,7 +558,9 @@ class ScanDocumentsByApi extends GetxController {
       try {
         final decoded = jsonDecode(responseString);
         if (decoded['status'] == 'success' && decoded['message']['file_link'] != null) {
-          box.write(BoxName.driverPhotoUrl, decoded['message']['file_link'].toString());
+          String rawUrl = decoded['message']['file_link'].toString();
+          String filename = rawUrl.split('/').last;
+          box.write(BoxName.driverPhotoUrl, '${AppLink.server}/portrate_captain_image/$filename');
         }
       } catch (_) {}
     }
diff --git a/siro_driver/lib/controller/functions/upload_image.dart b/siro_driver/lib/controller/functions/upload_image.dart
index 5f0dc3e4..6f1ee4c0 100755
--- a/siro_driver/lib/controller/functions/upload_image.dart
+++ b/siro_driver/lib/controller/functions/upload_image.dart
@@ -15,6 +15,7 @@ import 'package:path_provider/path_provider.dart' as path_provider;
 import '../../constant/box_name.dart';
 import '../../constant/colors.dart';
 import '../../constant/info.dart';
+import '../../constant/links.dart';
 import '../../main.dart';
 import '../../print.dart';
 import 'encrypt_decrypt.dart';
@@ -434,7 +435,9 @@ class ImageController extends GetxController {
       
       if (response != null && response['status'] == 'success' && response['message'] != null) {
         if (response['message']['file_link'] != null) {
-          box.write(BoxName.driverPhotoUrl, response['message']['file_link'].toString());
+          String rawUrl = response['message']['file_link'].toString();
+          String filename = rawUrl.split('/').last;
+          box.write(BoxName.driverPhotoUrl, '${AppLink.server}/portrate_captain_image/$filename');
         }
       }
     } catch (e) {
diff --git a/siro_driver/lib/views/home/Captin/home_captain/drawer_captain.dart b/siro_driver/lib/views/home/Captin/home_captain/drawer_captain.dart
index 33dd93ef..b3708611 100755
--- a/siro_driver/lib/views/home/Captin/home_captain/drawer_captain.dart
+++ b/siro_driver/lib/views/home/Captin/home_captain/drawer_captain.dart
@@ -333,13 +333,13 @@ class UserHeader extends StatelessWidget {
               child: controller.isloading
                   ? const CircularProgressIndicator(color: Colors.white)
                   : CircleAvatar(
-                      backgroundImage: NetworkImage((box
+                      backgroundImage: (box
                                   .read(BoxName.driverPhotoUrl)
                                   ?.toString()
                                   .isNotEmpty ==
                               true)
-                          ? box.read(BoxName.driverPhotoUrl)
-                          : '${AppLink.server}/portrate_captain_image/${box.read(BoxName.driverID)}.jpg'),
+                          ? NetworkImage(box.read(BoxName.driverPhotoUrl))
+                          : null,
 
                       // [تعديل هام]: في حال فشل تحميل الصورة (غير موجودة)
                       onBackgroundImageError: (exception, stackTrace) {