diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java
index 8d8e1028f..bd3c1bfbe 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java
@@ -183,7 +183,7 @@ public class LoansApiResource {
 						"repaymentFrequencyType", "interestRateFrequencyType", "amortizationType", "interestType", "interestCalculationPeriodType",
 						"submittedOnDate", "approvedOnDate", "expectedDisbursementDate", "actualDisbursementDate", 
 						"expectedFirstRepaymentOnDate", "interestChargedFromDate", "closedOnDate", "expectedMaturityDate", 
-						"status", "lifeCycleStatusDate", "loanOfficerName", "loanOfficerId", "charges")
+						"status", "lifeCycleStatusDate", "loanOfficerName", "loanOfficerId")
 				);
 		
 		Set<String> responseParameters = ApiParameterHelper.extractFieldsForResponseIfProvided(uriInfo.getQueryParameters());
@@ -245,7 +245,7 @@ public class LoansApiResource {
 			responseParameters.addAll(
 						Arrays.asList("productOptions", "amortizationTypeOptions", "interestTypeOptions", "interestCalculationPeriodTypeOptions", 
 						"repaymentFrequencyTypeOptions", "interestRateFrequencyTypeOptions", "fundOptions", 
-						"repaymentStrategyOptions", "chargeOptions", "loanOfficerOptions")
+						"repaymentStrategyOptions", "chargeOptions", "chargeTemplate", "loanOfficerOptions")
 			);
 			
 			productOptions = this.loanProductReadPlatformService.retrieveAllLoanProductsForLookup();
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java
index 61f501ebd..4e3a95835 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java
@@ -301,8 +301,7 @@ public class Loan extends AbstractAuditableCustom<AppUser, Long> {
 
         if (command.isChargesChanged()) {
 			this.charges.clear();
-			
-			this.charges = associateChargesWithThisLoan(charges);
+			this.charges.addAll(associateChargesWithThisLoan(charges));
 			this.totalChargesDueAtDisbursement = deriveSumTotalOfChargesDueAtDisbursement();
 		}