diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 1fe83b13..1eaba059 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/edit/RecipientEditV3Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/edit/RecipientEditV3Presenter.java
index 61b1323e..97b751f0 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/edit/RecipientEditV3Presenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/edit/RecipientEditV3Presenter.java
@@ -362,19 +362,20 @@ public class RecipientEditV3Presenter extends RecipientAddEditBaseV3Presenter {
                 view.showMobilePrefixAndFlag(gateway.getMobilePrefixFromCountryCode(validator.getRecipientDetail().getCountryCode()), CountryFlagMapper.getFlagFromCountryCode(validator.getRecipientDetail().getCountryCode()));
                 view.showCountrySelectionView(true);
                 view.showPaymentSelectionView(true);
-                if (validator.getRecipientDetail().getPaymentMethod() == null) {
-                    //Since payment method is not available at the moment we cannot show his existing mapped data
-                    for (CountryServiceModel countryServiceModel : t.getData()) {
-                        if (countryServiceModel.getCountryCode().equalsIgnoreCase(validator.getRecipientDetail().getCountryCode())) {
-                            validator.updateSelectedCountry(countryServiceModel);
-                            break;
-                        }
+
+                for (CountryServiceModel countryServiceModel : t.getData()) {
+                    if (countryServiceModel.getCountryCode().equalsIgnoreCase(validator.getRecipientDetail().getCountryCode())) {
+                        validator.updateSelectedCountry(countryServiceModel);
+                        break;
                     }
+                }
+
+                if (validator.getRecipientDetail().getPaymentMethod() != null) {
 
-                } else {
                     String countryId = validator.getRecipientDetail().getCountryId();
                     String serviceTypeID = validator.getRecipientDetail().getPaymentMethod().getId();
                     getDynamicValidationAndDropDownList(countryId, serviceTypeID);
+
                 }
 
 
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientlistingV3/RecipientListingV3Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientlistingV3/RecipientListingV3Presenter.java
index e16a147d..3571110a 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientlistingV3/RecipientListingV3Presenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientlistingV3/RecipientListingV3Presenter.java
@@ -103,7 +103,7 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi
     public void saveSelectedRecipientInfomation(ReceiverInfoV3Model recipientInfoModel) {
         if (recipientInfoModel.getPaymentMethod() == null || recipientInfoModel.hasPartnerChanged()) {
             String message = "";
-            if (recipientInfoModel.getPaymentMethod() == null)
+            if (recipientInfoModel.getPaymentMethod() != null && recipientInfoModel.getPaymentMethod().getId()==null)
                 message = getStringfromStringId(R.string.recipient_profile_update_prompt_text);
             else
                 message = getStringfromStringId(R.string.recipient_bank_update_prompt_text);