diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java
index 2c4e876..068173a 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java
@@ -40,6 +40,7 @@
 import org.openimis.imisclaims.util.DateUtils;
 import org.openimis.imisclaims.util.TextViewUtils;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -213,6 +214,8 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
         etPreAuthorization.setChecked(false);
         tfReferal.setVisibility(View.GONE);
 
+        LocalDate today = LocalDate.now();
+        etStartDate.setText(today.toString());
         etStartDate.setOnTouchListener((v, event) -> {
             showDialog(StartDate_Dialog_ID);
             return false;
@@ -384,22 +387,32 @@ private  void addService() {
 
     @Override
     protected Dialog onCreateDialog(int id) {
+        DatePickerDialog dialog;
+        year = cal.get(Calendar.YEAR);
+        month = cal.get(Calendar.MONTH);
+        day = cal.get(Calendar.DAY_OF_MONTH);
+
         switch (id) {
 
             case StartDate_Dialog_ID:
-
-                year = cal.get(Calendar.YEAR);
-                month = cal.get(Calendar.MONTH);
-                day = cal.get(Calendar.DAY_OF_MONTH);
-
-                return new DatePickerDialog(this, StartdatePickerListener, year, month, day);
+                dialog = new DatePickerDialog(this, StartdatePickerListener, year, month, day);
+                dialog.getDatePicker().setMaxDate(System.currentTimeMillis());
+                return dialog;
 
             case EndDate_Dialog_ID:
-                year = cal.get(Calendar.YEAR);
-                month = cal.get(Calendar.MONTH);
-                day = cal.get(Calendar.DAY_OF_MONTH);
+                dialog = new DatePickerDialog(this, EndDatePickerListner, year, month, day);
 
-                return new DatePickerDialog(this, EndDatePickerListner, year, month, day);
+                String startDateStr = etStartDate.getText().toString();
+                if (!startDateStr.isEmpty()) {
+                    try {
+                        Date startDate = DateUtils.dateFromString(startDateStr);
+                        dialog.getDatePicker().setMinDate(startDate.getTime());
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+                dialog.getDatePicker().setMaxDate(System.currentTimeMillis());
+                return dialog;
         }
         return null;
     }