diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 7f6118dc..45d5efba 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/RecipientDetailValidatorV3.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java
index 093f4d73..87668b8b 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java
@@ -1056,7 +1056,6 @@ public class RecipientDetailValidatorV3 {
                                                 rule.getMaxFieldLengthInt()));
 
                                 rule.updateValidity(true);
-                                recipientInfo.getAgent().setAccountNo(null);
                             }
 
                         }
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java
index f6bef403..87543b7e 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java
@@ -155,6 +155,8 @@ public class RecipientAddV3Presenter extends RecipientAddEditBaseV3Presenter  {
 
         }
 
+        validator.clearAccountIfNotRequired();
+
         compositeDisposable.add(
                 this.gateway.addRecipient(gateway.getAuth(), gateway.getUserIDNumber(), validator.getRecipientDetail())
                         .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
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 64bcf3ac..a622cc5e 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
@@ -95,7 +95,6 @@ public class RecipientEditV3Presenter extends RecipientAddEditBaseV3Presenter {
 
     @Override
     public void onSubmitBtnPressed() {
-        Log.d(this.getClass().getSimpleName(), validator.getRecipientDetail().toString());
         if (validator.requiresAccountValidation())
             performAccountValidation(validator.getRecipientDetail().getAgent().getAccountNo());
         else
@@ -113,7 +112,6 @@ public class RecipientEditV3Presenter extends RecipientAddEditBaseV3Presenter {
         }
 
 
-        //TODO Test Required
         validator.clearAccountIfNotRequired();
 
         compositeDisposable.add(