diff --git a/lib/core/utils/request_utils.dart b/lib/core/utils/request_utils.dart
index fc9815d..00bfc94 100644
--- a/lib/core/utils/request_utils.dart
+++ b/lib/core/utils/request_utils.dart
@@ -65,7 +65,7 @@ class RequestUtils {
       required String? deviceToken,
       required bool patientOutSA,
       required String? loginTokenID,
-       RegistrationDataModelPayload? registeredData,
+      RegistrationDataModelPayload? registeredData,
       int? patientId,
       required String nationIdText,
       required String countryCode,
@@ -85,7 +85,12 @@ class RequestUtils {
     request.logInTokenID = loginTokenID ?? "";
 
     if (registeredData != null) {
-      request.searchType = registeredData.searchType ?? 1;
+      //TODO: Issue Here if Not Signup
+      request.searchType = registeredData.searchType != null
+          ? registeredData.searchType
+          : fileNo
+              ? 1
+              : 2;
       request.patientID = registeredData.patientId ?? 0;
       request.patientIdentificationID = request.nationalID = (registeredData.patientIdentificationId ?? 0);
       request.dob = registeredData.dob;
@@ -95,9 +100,11 @@ class RequestUtils {
         request.patientID = patientId ?? int.parse(nationIdText);
         request.patientIdentificationID = request.nationalID = 0;
         request.searchType = 2;
+        //TODO: Issue HEre is Not Login
       } else {
         request.patientID = 0;
         request.searchType = 1;
+        //TODO: Issue HEre is Not Login
         request.patientIdentificationID = request.nationalID = (nationIdText.isNotEmpty ? int.parse(nationIdText) : 0);
       }
       request.isRegister = false;
diff --git a/lib/features/authentication/authentication_view_model.dart b/lib/features/authentication/authentication_view_model.dart
index ed7cb60..b2464f6 100644
--- a/lib/features/authentication/authentication_view_model.dart
+++ b/lib/features/authentication/authentication_view_model.dart
@@ -383,7 +383,11 @@ class AuthenticationViewModel extends ChangeNotifier {
                 ? _appState.getUserRegistrationPayload.projectOutSa == 1
                     ? true
                     : false
-                : _appState.getSelectDeviceByImeiRespModelElement!.outSa!,
+                : _appState.getSelectDeviceByImeiRespModelElement != null
+                    ? _appState.getSelectDeviceByImeiRespModelElement!.outSa!
+                    : selectedCountrySignup == CountryEnum.saudiArabia
+                        ? false
+                        : true,
             loginTokenID: _appState.appAuthToken,
             registeredData: isForRegister ? _appState.getUserRegistrationPayload : null,
             nationIdText: nationalIdController.text,
@@ -438,7 +442,7 @@ class AuthenticationViewModel extends ChangeNotifier {
 
           return;
         } else if (activation.messageStatus == 2) {
-           LoaderBottomSheet.hideLoader();
+          LoaderBottomSheet.hideLoader();
           onWrongActivationCode(activation.errorEndUserMessage);
           return;
         } else if (_appState.getUserRegistrationPayload.isRegister == true) {
@@ -820,10 +824,8 @@ class AuthenticationViewModel extends ChangeNotifier {
         log("Insert IMEI Failed");
       }
     });
-
   }
 
-
   Future<void> getPatientDeviceData(int loginType) async {
     final resultEither = await _authenticationRepo.getPatientDeviceData(
         patientDeviceDataRequest: GetUserMobileDeviceData(