diff --git a/ui/app/i18n/reports/locale_en.json b/ui/app/i18n/reports/locale_en.json
index 2d123cfb6c..3c1dd130c6 100644
--- a/ui/app/i18n/reports/locale_en.json
+++ b/ui/app/i18n/reports/locale_en.json
@@ -44,5 +44,6 @@
     "CHOOSE_ANSWER_FROM_DROPDOWN_LABEL": "Choose Answer",
     "DELETE_LABEL": "Delete",
     "EDIT_LABEL": "Edit",
-    "REPORT_DATE_RANGE": "Select Date Range"
+    "REPORT_DATE_RANGE": "Select Date Range",
+    "START_DATE_CANNOT_LATER_THAN_STOP_DATE": "start date can not be later than stop date"
 }
\ No newline at end of file
diff --git a/ui/app/reports/controllers/reportsController.js b/ui/app/reports/controllers/reportsController.js
index e862fe9454..81f2882bd2 100644
--- a/ui/app/reports/controllers/reportsController.js
+++ b/ui/app/reports/controllers/reportsController.js
@@ -1,9 +1,12 @@
 'use strict';
 
 angular.module('bahmni.reports')
-    .controller('ReportsController', ['$scope', 'appService', 'reportService', 'FileUploader', 'messagingService', 'spinner', '$rootScope', 'auditLogService', function ($scope, appService, reportService, FileUploader, messagingService, spinner, $rootScope, auditLogService) {
+    .controller('ReportsController', ['$scope', 'appService', 'reportService', 'FileUploader', 'messagingService', 'spinner', '$rootScope', '$translate', 'auditLogService', function ($scope, appService, reportService, FileUploader, messagingService, spinner, $rootScope, $translate, auditLogService) {
         const format = _.values(reportService.getAvailableFormats());
         const dateRange = _.values(reportService.getAvailableDateRange());
+        var getTranslatedMessage = function (key) {
+            return $translate.instant(key);
+        };
 
         $scope.uploader = new FileUploader({
             url: Bahmni.Common.Constants.uploadReportTemplateUrl,
@@ -38,6 +41,7 @@ angular.module('bahmni.reports')
                     report['stopDate'] = dateRange[0];
                 }
                 else if ($rootScope.default[header][item] === undefined) {
+                    $rootScope.default.reportsRequiringDateRange.startDate = dateRange[0];
                     $rootScope.reportsRequiringDateRange.forEach(function (report) {
                         report.startDate = dateRange[0];
                         report.stopDate = dateRange[0];
@@ -76,6 +80,9 @@ angular.module('bahmni.reports')
                 if (!report.stopDate) {
                     msg.push("end date");
                 }
+                if ((report.startDate > report.stopDate)) {
+                    msg.push(getTranslatedMessage("START_DATE_CANNOT_LATER_THAN_STOP_DATE"));
+                }
                 messagingService.showMessage("error", "Please select the " + msg.join(" and "));
                 return false;
             }
diff --git a/ui/app/reports/views/reports.html b/ui/app/reports/views/reports.html
index ccb5cb9828..767460b8c2 100644
--- a/ui/app/reports/views/reports.html
+++ b/ui/app/reports/views/reports.html
@@ -25,7 +25,7 @@ <h2 class="section-title">{{::'REPORTS_TITLE_KEY' | translate}}</h2>
                 <th class="reports-stop-date">{{::'REPORTS_END_DATE_HEADER_KEY' |translate}}
                     <span class="asterick">*</span>
                     <input ng-model="default.reportsRequiringDateRange.stopDate" date-converter
-                           class="form-field start-date" type="date" min="{{default.reportsRequiringDateRange.startDate | date:'yyyy-MM-dd'}}"
+                           class="form-field stop-date" type="date" min="{{default.reportsRequiringDateRange.startDate | date:'yyyy-MM-dd'}}"
                            ng-change="setDefault('stopDate', 'reportsRequiringDateRange')">
                 </th>
                 <th class="reports-format">
@@ -45,12 +45,10 @@ <h2 class="section-title">{{::'REPORTS_TITLE_KEY' | translate}}</h2>
             <tr ng-repeat="report in ::reportsRequiringDateRange" show-if-privilege="{{:: report.requiredPrivilege}}">
                 <td>{{:: report.name |translate }}</td>
                 <td class="reports-start-date">
-                    <input date-converter class="form-field start-date" type="date" max="{{report.stopDate + 1 | date:'yyyy-MM-dd'}}"
-                           ng-model="report.startDate">
+                    <input date-converter class="form-field start-date" type="date" ng-model="report.startDate">  
                 </td>
                 <td class="reports-stop-date">
-                    <input date-converter class="form-field stop-date" type="date" min="{{report.startDate | date:'yyyy-MM-dd'}}"
-                            ng-model="report.stopDate">
+                    <input date-converter class="form-field stop-date" type="date" min="{{report.startDate | date:'yyyy-MM-dd'}}" ng-model="report.stopDate">
                 </td>
                 <td class="reports-format">
                     <select ng-model="report.responseType" ng-options="type as label for (label , type) in ::formats">
diff --git a/ui/test/unit/reports/controllers/reportsController.spec.js b/ui/test/unit/reports/controllers/reportsController.spec.js
index 90292e0e6e..729ab80fcd 100644
--- a/ui/test/unit/reports/controllers/reportsController.spec.js
+++ b/ui/test/unit/reports/controllers/reportsController.spec.js
@@ -108,6 +108,82 @@ describe("ReportsController", function () {
         expect(rootScope.reportsRequiringDateRange[0].stopDate).toBe(rootScope.default.reportsRequiringDateRange.stopDate);
     });
 
+    it("should return date and month for the this month", function () {
+        var currentDate = new Date();
+        rootScope.default.reportsRequiringDateRange = {
+            dateRangeType: new Date(currentDate.getFullYear(), currentDate.getMonth(), 1)
+        };
+
+        scope.setDefault('dateRangeType', 'reportsRequiringDateRange');
+
+        expect(_.keys(rootScope.default.reportsRequiringDateRange).length).toBe(3);
+        expect((rootScope.default.reportsRequiringDateRange.dateRangeType).getDate()).toBe(1);
+        expect(rootScope.reportsRequiringDateRange[0].startDate.getDate()).toBe(1);
+        expect(rootScope.reportsRequiringDateRange[0].startDate.getMonth()).toBe(currentDate.getMonth());
+        expect(rootScope.reportsRequiringDateRange[0].stopDate.getDate()).toBe(currentDate.getDate());
+        expect(rootScope.reportsRequiringDateRange[0].stopDate.getMonth()).toBe(currentDate.getMonth());
+    });
+
+    it("should return date and month for the this quarter", function () {
+        var currentDate = new Date();
+        rootScope.default.reportsRequiringDateRange = {
+            dateRangeType: new Date(currentDate.getFullYear(), Math.floor(currentDate.getMonth() / 3) * 3, 1)
+        };
+
+        scope.setDefault('dateRangeType', 'reportsRequiringDateRange');
+
+        expect(_.keys(rootScope.default.reportsRequiringDateRange).length).toBe(3);
+        expect((rootScope.default.reportsRequiringDateRange.dateRangeType).getDate()).toBe(1);
+        expect(rootScope.reportsRequiringDateRange[0].startDate.getDate()).toBe(1);
+        expect(rootScope.reportsRequiringDateRange[0].startDate.getMonth()).toBe(currentDate.getMonth());
+        expect(rootScope.reportsRequiringDateRange[0].stopDate.getDate()).toBe(currentDate.getDate());
+        expect(rootScope.reportsRequiringDateRange[0].stopDate.getMonth()).toBe(currentDate.getMonth());
+    });
+
+    it("should return date and month for the this year", function () {
+        var currentDate = new Date();
+        rootScope.default.reportsRequiringDateRange = {
+            dateRangeType: new Date(currentDate.getFullYear(), 0, 1)
+        };
+
+        scope.setDefault('dateRangeType', 'reportsRequiringDateRange');
+
+        expect(_.keys(rootScope.default.reportsRequiringDateRange).length).toBe(3);
+        expect((rootScope.default.reportsRequiringDateRange.dateRangeType).getDate()).toBe(1);
+        expect(rootScope.reportsRequiringDateRange[0].startDate.getDate()).toBe(1);
+        expect(rootScope.reportsRequiringDateRange[0].startDate.getMonth()).toBe(0);
+        expect(rootScope.reportsRequiringDateRange[0].stopDate.getDate()).toBe(currentDate.getDate());
+        expect(rootScope.reportsRequiringDateRange[0].stopDate.getMonth()).toBe(currentDate.getMonth());
+    });
+
+    it("should return date and month for last 7 days", function () {
+        var currentDate = new Date();
+        rootScope.default.reportsRequiringDateRange = {
+            dateRangeType: new Date(new Date().setDate(currentDate.getDate() - 6))
+        };
+
+        scope.setDefault('dateRangeType', 'reportsRequiringDateRange');
+
+        expect(_.keys(rootScope.default.reportsRequiringDateRange).length).toBe(3);
+        expect(rootScope.reportsRequiringDateRange[0].startDate.getDate()).toBe(rootScope.default.reportsRequiringDateRange.startDate.getDate());
+        expect(rootScope.reportsRequiringDateRange[0].startDate.getMonth()).toBe(currentDate.getMonth());
+        expect(rootScope.reportsRequiringDateRange[0].stopDate.getDate()).toBe(currentDate.getDate());
+        expect(rootScope.reportsRequiringDateRange[0].stopDate.getMonth()).toBe(currentDate.getMonth());
+    });
+
+    it("should return date and month for last 30 days", function () {
+        var currentDate = new Date();
+        rootScope.default.reportsRequiringDateRange = {
+            dateRangeType: new Date(new Date().setDate(currentDate.getDate() - 30))
+        };
+
+        scope.setDefault('dateRangeType', 'reportsRequiringDateRange');
+
+        expect(_.keys(rootScope.default.reportsRequiringDateRange).length).toBe(3);
+        expect(rootScope.reportsRequiringDateRange[0].startDate.getDate()).toBe(rootScope.default.reportsRequiringDateRange.startDate.getDate());
+        expect(rootScope.reportsRequiringDateRange[0].stopDate.getDate()).toBe(currentDate.getDate());
+    });
+
     it('should initialise all available formats when supportedFormats config is not specified', function () {
         mockAppDescriptor.getConfigValue.and.returnValue(undefined);