diff --git a/esignet-service/src/main/resources/application-default.properties b/esignet-service/src/main/resources/application-default.properties
index 25f3738e8..4c9239a25 100644
--- a/esignet-service/src/main/resources/application-default.properties
+++ b/esignet-service/src/main/resources/application-default.properties
@@ -374,7 +374,7 @@ mosip.esignet.ui.config.username.prefix=
 mosip.esignet.ui.config.username.postfix=
 mosip.esignet.ui.config.username.max-length=12
 mosip.esignet.ui.config.username.input-type=text
-mosip.esignet.ui.config.login-id.options={{ 'id': 'mobile', 'svg': 'mobile_icon', 'prefixes': {{'label': 'IND', 'value': '+91', 'maxLength': "", 'regex': ""}, {'label': 'KHM', 'value': '+855', 'regex': '^\\d*$'}, {'label': 'USA', 'value': '+1', 'maxLength': '5'}}, 'postfix': '', 'maxLength': 9, 'regex': '^[a-zA-Z]+$' }, { 'id': 'nrc', 'svg': 'nrc_id_icon', 'prefixes': 'nrc', 'postfix': '@NRC', 'maxLength': 5, 'regex': "" }, { 'id': 'vid', 'svg': 'vid_icon', 'prefixes': "", 'postfix': '@ID', 'maxLength': '7', 'regex': '^[a-zA-Z]+$' }, { 'id': 'email', 'svg': 'email_icon', 'prefixes': "", 'postfix': "", 'maxLength': "", 'regex': '^\\d*$' }}
+mosip.esignet.ui.config.login-id.options={{ 'id': 'mobile', 'svg': 'mobile_icon', 'prefixes': {{'label': 'KHM', 'value': '+855', 'regex': ''}, {'label': 'IND', 'value': '+91', 'maxLength': '', 'regex': ''}, {'label': 'USA', 'value': '+1', 'maxLength': ''}}, 'postfix': '', 'maxLength': '', 'regex': '' }, { 'id': 'nrc', 'svg': 'nrc_id_icon', 'prefixes': '', 'postfix': '', 'maxLength': '', 'regex': '' }, { 'id': 'vid', 'svg': 'vid_icon', 'prefixes': '', 'postfix': '', 'maxLength': '', 'regex': '' }, { 'id': 'email', 'svg': 'email_icon', 'prefixes': '', 'postfix': '', 'maxLength': '', 'regex': '' }}
 
 mosip.esignet.ui.config.key-values={'sbi.env': '${mosip.esignet.authenticator.ida-env:Developer}', 'sbi.timeout.DISC': 30, \
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
diff --git a/oidc-ui/public/locales/ar.json b/oidc-ui/public/locales/ar.json
index b449b1f1c..ec0fa6e4f 100644
--- a/oidc-ui/public/locales/ar.json
+++ b/oidc-ui/public/locales/ar.json
@@ -123,7 +123,8 @@
     "failed": "غير قادر على تسجيل الدخول. ",
     "refresh": "تحديث رمز الاستجابة السريعة",
     "open_wallet_app": "يفتح {{walletName}} برنامج",
-    "login_with_id": "تسجيل الدخول باستخدام {{currentID}}"
+    "login_with_id": "تسجيل الدخول باستخدام {{currentID}}",
+    "wallet_header": "امسح رمز QR ضوئيًا باستخدام تطبيق {{walletName}}."
   },
   "otp": {
     "sign_in_with_otp": "تسجيل الدخول باستخدام OTP",
diff --git a/oidc-ui/public/locales/en.json b/oidc-ui/public/locales/en.json
index bdeb06ce7..a3b6a08a9 100644
--- a/oidc-ui/public/locales/en.json
+++ b/oidc-ui/public/locales/en.json
@@ -123,7 +123,8 @@
     "failed": "Unable to login. Please scan QR code and try again.",
     "refresh": "Refresh QR Code",
     "open_wallet_app": "Open {{walletName}} App",
-    "login_with_id": "Login with {{currentID}}"
+    "login_with_id": "Login with {{currentID}}",
+    "wallet_header": "Scan the QR code with {{walletName}} app"
   },
   "otp": {
     "sign_in_with_otp": "Login with OTP",
diff --git a/oidc-ui/public/locales/hi.json b/oidc-ui/public/locales/hi.json
index 5db430d60..28c21d3d4 100644
--- a/oidc-ui/public/locales/hi.json
+++ b/oidc-ui/public/locales/hi.json
@@ -123,7 +123,8 @@
     "failed": "लॉगिन करने में असमर्थ। ",
     "refresh": "क्यूआर कोड रिफ्रेश करें",
     "open_wallet_app": "खुला {{walletName}} अनुप्रयोग",
-    "login_with_id": "{{currentID}} से लॉगिन करें"
+    "login_with_id": "{{currentID}} से लॉगिन करें",
+    "wallet_header": "{{walletName}} ऐप से QR कोड को स्कैन करें"
   },
   "otp": {
     "sign_in_with_otp": "ओटीपी से लॉगइन करें",
diff --git a/oidc-ui/public/locales/km.json b/oidc-ui/public/locales/km.json
index 7ffbdd48b..e7f77d89f 100644
--- a/oidc-ui/public/locales/km.json
+++ b/oidc-ui/public/locales/km.json
@@ -123,7 +123,8 @@
     "failed": "មិនអាចចូលបានទេ។ ",
     "refresh": "ផ្ទុកកូដ QR ឡើងវិញ",
     "open_wallet_app": "បើក {{walletName}} កម្មវិធី",
-    "login_with_id": "ចូលដោយប្រើ {{currentID}}"
+    "login_with_id": "ចូលដោយប្រើ {{currentID}}",
+    "wallet_header": "ស្កេនកូដ QR ជាមួយកម្មវិធី {{walletName}}"
   },
   "otp": {
     "sign_in_with_otp": "ចូលជាមួយ OTP",
diff --git a/oidc-ui/public/locales/kn.json b/oidc-ui/public/locales/kn.json
index 83cbf1015..c8e6b29cd 100644
--- a/oidc-ui/public/locales/kn.json
+++ b/oidc-ui/public/locales/kn.json
@@ -123,7 +123,8 @@
     "failed": "ಲಾಗಿನ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ",
     "refresh": "QR ಕೋಡ್ ಅನ್ನು ರಿಫ್ರೆಶ್ ಮಾಡಿ",
     "open_wallet_app": "ತೆರೆಯಿರಿ {{walletName}} ಅಪ್ಲಿಕೇಶನ್",
-    "login_with_id": "{{currentID}} ನೊಂದಿಗೆ ಲಾಗಿನ್ ಮಾಡಿ"
+    "login_with_id": "{{currentID}} ನೊಂದಿಗೆ ಲಾಗಿನ್ ಮಾಡಿ",
+    "wallet_header": "{{walletName}} ಅಪ್ಲಿಕೇಶನ್‌ನೊಂದಿಗೆ QR ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ"
   },
   "otp": {
     "sign_in_with_otp": "OTP ಯೊಂದಿಗೆ ಲಾಗಿನ್ ಮಾಡಿ",
diff --git a/oidc-ui/public/locales/ta.json b/oidc-ui/public/locales/ta.json
index 86ae6a03d..fcc81a7fc 100644
--- a/oidc-ui/public/locales/ta.json
+++ b/oidc-ui/public/locales/ta.json
@@ -123,7 +123,8 @@
     "failed": "உள்நுழைய முடியவில்லை. ",
     "refresh": "QR குறியீட்டைப் புதுப்பிக்கவும்",
     "open_wallet_app": "திற {{walletName}} ஆப்",
-    "login_with_id": "{{currentID}} மூலம் உள்நுழைக"
+    "login_with_id": "{{currentID}} மூலம் உள்நுழைக",
+    "wallet_header": "{{walletName}} ஆப்ஸ் மூலம் QR குறியீட்டை ஸ்கேன் செய்யவும்"
   },
   "otp": {
     "sign_in_with_otp": "OTP மூலம் உள்நுழையவும்",
diff --git a/oidc-ui/src/components/LoginQRCode.js b/oidc-ui/src/components/LoginQRCode.js
index f68d876de..60a1ebf72 100644
--- a/oidc-ui/src/components/LoginQRCode.js
+++ b/oidc-ui/src/components/LoginQRCode.js
@@ -514,8 +514,9 @@ export default function LoginQRCode({
         {qr && (
           <>
             <p className="text-center mb-3 relative bottom-4 qr-title">
-              Scan the QR code with {walletDetail[walletConfigKeys.walletName]}{" "}
-              app
+              {t1("wallet_header", {
+                walletName: walletDetail[walletConfigKeys.walletName],
+              })}
             </p>
             <div className="w-full flex justify-center">
               <button
diff --git a/oidc-ui/src/components/OtpVerify.js b/oidc-ui/src/components/OtpVerify.js
index 0bdb5b773..b9aceb260 100644
--- a/oidc-ui/src/components/OtpVerify.js
+++ b/oidc-ui/src/components/OtpVerify.js
@@ -426,7 +426,7 @@ export default function OtpVerify({
             text={t1("resend_otp")}
             handleClick={handleSendOtp}
             id="resend_otp"
-            disabled={showCaptcha && captchaToken === null}
+            disabled={(showCaptcha && captchaToken === null) || !showResendOtp}
             customClassName={`!bg-white !border-none !p-0 !w-max !m-auto ${
               showResendOtp ? "resend_otp" : "!text-gray-400"
             }`}