diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html
index 8d425e32c..b0091117a 100644
--- a/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html
@@ -535,7 +535,7 @@
 
     <mat-form-field class="flex-30">
       <mat-label>{{ 'labels.inputs.Frequency' | translate }}</mat-label>
-      <input type="number" matInput formControlName="repaymentEvery" required />
+      <input type="number" min="1" matInput formControlName="repaymentEvery" required />
       <mat-error>
         {{ 'labels.inputs.Repaid every' | translate }} {{ 'labels.inputs.Frequency' | translate }}
         {{ 'labels.commons.is' | translate }}
@@ -584,7 +584,7 @@
 
     <mat-form-field class="flex-48">
       <mat-label>{{ 'labels.inputs.Minimum days between disbursal and first repayment date' | translate }}</mat-label>
-      <input type="number" matInput formControlName="minimumDaysBetweenDisbursalAndFirstRepayment" />
+      <input type="number" min="0" matInput formControlName="minimumDaysBetweenDisbursalAndFirstRepayment" />
     </mat-form-field>
   </div>
 
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.ts
index 17a1867e5..df812349a 100644
--- a/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.ts
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.ts
@@ -266,13 +266,19 @@ export class LoanProductTermsStepComponent implements OnInit, OnChanges {
       ],
       repaymentEvery: [
         '',
-        Validators.required
+        [
+          Validators.required,
+          Validators.min(1)
+        ]
       ],
       repaymentFrequencyType: [
         '',
         Validators.required
       ],
-      minimumDaysBetweenDisbursalAndFirstRepayment: [''],
+      minimumDaysBetweenDisbursalAndFirstRepayment: [
+        '',
+        []
+      ],
       repaymentStartDateType: [1],
       fixedLength: [null],
       interestRecognitionOnDisbursementDate: [false]