diff --git a/lib/config/config.dart b/lib/config/config.dart
index e604cdfd..b399fa00 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -19,9 +19,9 @@ var PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
 var PACKAGES_ORDERS = '/api/orders';
 var PACKAGES_ORDER_HISTORY = '/api/orders/items';
 var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
- // var  BASE_URL = 'http://10.50.100.198:2018/';
- var  BASE_URL = 'https://uat.hmgwebservices.com/';
-// var BASE_URL = 'https://hmgwebservices.com/';
+ // var  BASE_URL = 'http://10.20.200.111:1010/';
+ // var  BASE_URL = 'https://uat.hmgwebservices.com/';
+var BASE_URL = 'https://hmgwebservices.com/';
 // var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
 // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
 // var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/';
diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart
index 3f1ce94c..8921d5f9 100644
--- a/lib/core/service/client/base_app_client.dart
+++ b/lib/core/service/client/base_app_client.dart
@@ -75,7 +75,11 @@ class BaseAppClient {
         body['Channel'] = CHANNEL;
 
         if (body.containsKey('LanguageID')) {
-          body['LanguageID'] = body['LanguageID'];
+          if(body['LanguageID'] != null) {
+            body['LanguageID'] = body['LanguageID'];
+          } else {
+            body['LanguageID'] = Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).isArabic ? 1 : 2;
+          }
         } else {
           // body['LanguageID'] = (languageID.toString().toLowerCase() == 'ar' ? 1 : 2);
           body['LanguageID'] = Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).isArabic ? 1 : 2;
@@ -165,7 +169,7 @@ class BaseAppClient {
 
       // body['IdentificationNo'] = 1023854217;
       // body['MobileNo'] = "531940021";
-      // body['PatientID'] = 2941698; //3844083
+      // body['PatientID'] = 1231755; //3844083
       // body['TokenID'] = "@dm!n";
 
       // Patient ID: 3027574
diff --git a/lib/models/Authentication/check_activation_code_request.dart b/lib/models/Authentication/check_activation_code_request.dart
index f6509f3b..7113dd6d 100644
--- a/lib/models/Authentication/check_activation_code_request.dart
+++ b/lib/models/Authentication/check_activation_code_request.dart
@@ -15,7 +15,7 @@ class CheckActivationCodeReq {
   bool isSilentLogin;
   double versionID;
   int channel;
-  int languageID;
+  // int languageID;
   String iPAdress;
   String generalid;
   int patientOutSA;
@@ -41,7 +41,7 @@ class CheckActivationCodeReq {
     this.isSilentLogin,
     this.versionID,
     this.channel,
-    this.languageID,
+    // this.languageID,
     this.iPAdress,
     this.generalid,
     this.patientOutSA,
@@ -68,7 +68,7 @@ class CheckActivationCodeReq {
     isSilentLogin = json['IsSilentLogin'];
     versionID = json['VersionID'];
     channel = json['Channel'];
-    languageID = json['LanguageID'];
+    // languageID = json['LanguageID'];
     iPAdress = json['IPAdress'];
     generalid = json['generalid'];
     patientOutSA = json['PatientOutSA'];
@@ -96,7 +96,7 @@ class CheckActivationCodeReq {
     data['IsSilentLogin'] = this.isSilentLogin;
     data['VersionID'] = this.versionID;
     data['Channel'] = this.channel;
-    data['LanguageID'] = this.languageID;
+    // data['LanguageID'] = this.languageID;
     data['IPAdress'] = this.iPAdress;
     data['generalid'] = this.generalid;
     data['PatientOutSA'] = this.patientOutSA;
diff --git a/lib/services/appointment_services/GetDoctorsList.dart b/lib/services/appointment_services/GetDoctorsList.dart
index a7482eaa..224f36f2 100644
--- a/lib/services/appointment_services/GetDoctorsList.dart
+++ b/lib/services/appointment_services/GetDoctorsList.dart
@@ -1165,6 +1165,7 @@ class DoctorsListService extends BaseService {
       "ProjectID": appo.projectID,
       "SetupID": appo.setupID,
       "DoctorID": appo.doctorID,
+      "ClinicID": appo.clinicID,
       "RequestType": requestType,
       "RequestTypeID": requestType,
       "PatientMobileNumber": authUser.mobileNumber,
diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart
index f3a277fe..f6b54dac 100644
--- a/lib/widgets/in_app_browser/InAppBrowser.dart
+++ b/lib/widgets/in_app_browser/InAppBrowser.dart
@@ -284,7 +284,7 @@ class MyInAppBrowser extends InAppBrowser {
 
     Platform.isIOS
         ? form = form.replaceFirst('DEVICE_TOKEN', await AppSharedPreferences().getString(PUSH_TOKEN) + "," + await AppSharedPreferences().getString(ONESIGNAL_APNS_TOKEN))
-        : form = form.replaceFirst('DEVICE_TOKEN', await sharedPref.getString(PUSH_TOKEN));
+        : form = form.replaceFirst('DEVICE_TOKEN', await sharedPref.getString(PUSH_TOKEN) ?? "");
 
     // form = form.replaceFirst('DEVICE_TOKEN', await AppSharedPreferences().getString(PUSH_TOKEN) + "," + await AppSharedPreferences().getString(ONESIGNAL_APNS_TOKEN));
     // form = form.replaceFirst('DEVICE_TOKEN', await sharedPref.getString(PUSH_TOKEN));