diff --git a/lib/app/core/data/data_source_auth/remote_data_source/app_remote_data_source.dart b/lib/app/core/data/data_source_auth/remote_data_source/app_remote_data_source.dart
index 18015cc..6ed2f76 100644
--- a/lib/app/core/data/data_source_auth/remote_data_source/app_remote_data_source.dart
+++ b/lib/app/core/data/data_source_auth/remote_data_source/app_remote_data_source.dart
@@ -561,7 +561,7 @@ class AppRemoteDataSource {
   Future<ServerResponse> getCurrencyList() {
     Map<String, Object> queryParams = {};
 
-    queryParams["porOrgacode"] = "0005";
+    queryParams["porOrgacode"] = "1962";
 
     return ServerRequest.request(
       RequestAttr.withHeaderAndParams(UrlContants.fetchUcoDepositProducts, HttpMethod.GET, {}, queryParams),
diff --git a/lib/app/core/enums/request_constants.dart b/lib/app/core/enums/request_constants.dart
index 8244737..955844c 100644
--- a/lib/app/core/enums/request_constants.dart
+++ b/lib/app/core/enums/request_constants.dart
@@ -1,6 +1,6 @@
 class RequestConstants {
   // static const String porOrgacode = "0004"; // Genish
-  static const String porOrgacode = "0005"; // BEMO
+  static const String porOrgacode = "1962"; // BEMO
   static const String pctCstycode = "I";
   static const String channelCode = "01";
   static const String plcLocacode = "plcLocacode";
diff --git a/lib/app/custom_widgets/Fields/input_field.dart b/lib/app/custom_widgets/Fields/input_field.dart
index 689e196..06700cb 100644
--- a/lib/app/custom_widgets/Fields/input_field.dart
+++ b/lib/app/custom_widgets/Fields/input_field.dart
@@ -499,7 +499,7 @@ class InputField extends GetView {
     } else if (isPrefixRequired) {
       return (prefixCode ?? "") + controller!.text;
     }
-    return controller!.text;
+    return controller?.text ?? "";
   }
 }
 
diff --git a/lib/app/modules/add_money/controllers/add_money_controller.dart b/lib/app/modules/add_money/controllers/add_money_controller.dart
index 61bdc4c..99b2ac3 100644
--- a/lib/app/modules/add_money/controllers/add_money_controller.dart
+++ b/lib/app/modules/add_money/controllers/add_money_controller.dart
@@ -41,7 +41,7 @@ class AddMoneyController extends GetxController {
 
   late InputField searchAccount;
 
-  late InputField userTransactionPinField;
+  late InputField userTransactionPinField = InputField();
 
   List<DepositAccount> accountList = List.from(SessionCache.instance.depositAccountList);
 
diff --git a/lib/app/modules/add_money/views/add_money_view.dart b/lib/app/modules/add_money/views/add_money_view.dart
index 065caeb..e2af63f 100644
--- a/lib/app/modules/add_money/views/add_money_view.dart
+++ b/lib/app/modules/add_money/views/add_money_view.dart
@@ -77,7 +77,7 @@ class AddMoneyView extends GetView<AddMoneyController> {
                     child: Container(
                       color: AppColors.transparent,
                       child: SizedBox(
-                        width: 130,
+                        width: 92,
                         height: 60,
                         child: Row(
                           children: [
@@ -87,7 +87,7 @@ class AddMoneyView extends GetView<AddMoneyController> {
                               controller.selectedFromAccountCurrency.value.dmpProdshort,
                               style: context.textTheme.bodyMedium!.copyWith(fontSize: 16, color: AppColors.colorPrimary, fontWeight: FontWeight.w600),
                             ),
-                            const SizedBox(width: 105),
+                            const SizedBox(width: 6),
                             Image.asset(AppAssets.drop_down_ic, width: 10, height: 10),
                             const SizedBox(width: 6),
                           ],
diff --git a/lib/app/modules/login_otp/controllers/o_t_p_screen_controller.dart b/lib/app/modules/login_otp/controllers/o_t_p_screen_controller.dart
index 9dc4237..8cd7b85 100644
--- a/lib/app/modules/login_otp/controllers/o_t_p_screen_controller.dart
+++ b/lib/app/modules/login_otp/controllers/o_t_p_screen_controller.dart
@@ -32,7 +32,7 @@ class OTPScreenController extends GetxController {
     super.onReady();
     var arguments = Get.arguments;
     firstStepData = (arguments != null ? arguments[AppConstants.SIGN_UP_FIRST_STEP_DATA] ?? AuthenticationRequest.empty() : AuthenticationRequest.empty());
-    loginUsingFingerPrint = arguments[1];
+    loginUsingFingerPrint = arguments[1] ?? false;
     pinPutController.text = "";
   }