diff --git a/src/app/system/audit-trails/audit-trails.component.ts b/src/app/system/audit-trails/audit-trails.component.ts
index f6fe41a42..bdd6f1888 100644
--- a/src/app/system/audit-trails/audit-trails.component.ts
+++ b/src/app/system/audit-trails/audit-trails.component.ts
@@ -11,6 +11,7 @@ import { AuditTrailsDataSource } from './audit-trail.datasource';
 
 /** Custom Services */
 import { SystemService } from '../system.service';
+import { SettingsService } from 'app/settings/settings.service';
 
 /** rxjs Imports */
 import { merge } from 'rxjs';
@@ -90,11 +91,11 @@ export class AuditTrailsComponent implements OnInit, AfterViewInit {
     },
     {
       type: 'dateFormat',
-      value: 'yyyy-MM-dd'
+      value: this.settingsService.dateFormat
     },
     {
       type: 'locale',
-      value: 'en'
+      value: this.settingsService.language.code
     }
   ];
   /** User form control. */
@@ -130,7 +131,8 @@ export class AuditTrailsComponent implements OnInit, AfterViewInit {
    */
   constructor(private route: ActivatedRoute,
               private systemService: SystemService,
-              private datePipe: DatePipe) {
+              private datePipe: DatePipe,
+              private settingsService: SettingsService) {
     this.route.data.subscribe((data: { auditTrailSearchTemplate: any }) => {
       this.auditTrailSearchTemplateData = data.auditTrailSearchTemplate;
     });
@@ -382,7 +384,7 @@ export class AuditTrailsComponent implements OnInit, AfterViewInit {
    * Generates the CSV file of Audit Trails Data.
    */
   downloadCSV() {
-    const dateFormat = 'yyyy-MM-dd';
+    const dateFormat = this.settingsService.dateFormat;
     const replacer = (key: any, value: any) => value === undefined ? '' : value;
     const header = ['ID', 'Resource ID', 'Status', 'Office', 'Made On', 'Maker', 'Checked On', 'Checker', 'Entity', 'Action', 'Client'];
     const headerCode = ['id', 'resourceId', 'processingResult', 'officeName', 'madeOnDate', 'maker', 'checkedOnDate', 'checker', 'entityName', 'actionName', 'clientName'];
@@ -411,7 +413,7 @@ export class AuditTrailsComponent implements OnInit, AfterViewInit {
    * @param {any} timestamp Timestamp from which date is to be extracted.
    */
   private getDate(timestamp: any) {
-    const dateFormat = 'yyyy-MM-dd';
+    const dateFormat = this.settingsService.dateFormat;
     return this.datePipe.transform(timestamp, dateFormat);
   }
 
diff --git a/src/app/system/entity-to-entity-mapping/entity-to-entity-mapping.component.ts b/src/app/system/entity-to-entity-mapping/entity-to-entity-mapping.component.ts
index 60de8d26e..42fbb371e 100644
--- a/src/app/system/entity-to-entity-mapping/entity-to-entity-mapping.component.ts
+++ b/src/app/system/entity-to-entity-mapping/entity-to-entity-mapping.component.ts
@@ -10,6 +10,7 @@ import { DatePipe } from '@angular/common';
 /** Custom Services */
 import { SystemService } from 'app/system/system.service';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { SettingsService } from 'app/settings/settings.service';
 
 /** Custom Components */
 import { DeleteDialogComponent } from '../../shared/delete-dialog/delete-dialog.component';
@@ -82,7 +83,8 @@ export class EntityToEntityMappingComponent implements OnInit {
     private formBuilder: FormBuilder,
     private systemService: SystemService,
     private datePipe: DatePipe,
-    private dialog: MatDialog) {
+    private dialog: MatDialog,
+    private settingsService: SettingsService) {
     this.route.data.subscribe((data: { entityMappings: any }) => {
       this.entityMappings = data.entityMappings;
     });
@@ -313,7 +315,7 @@ export class EntityToEntityMappingComponent implements OnInit {
     if (addMappingForm.value.toId === '') {
       addMappingForm.value.toId = undefined;
     }
-    const dateFormat = 'dd MMMM yyyy';
+    const dateFormat = this.settingsService.dateFormat;
 
     const startDate: Date = addMappingForm.value.startDate;
     const endDate: Date = addMappingForm.value.endDate;
@@ -324,7 +326,7 @@ export class EntityToEntityMappingComponent implements OnInit {
     });
     const newMappingData = addMappingForm.value;
     newMappingData.dateFormat = dateFormat;
-    newMappingData.locale = 'en';
+    newMappingData.locale = this.settingsService.language.code;
     this.systemService.createMapping(this.relId, newMappingData).subscribe((response: any) => {
       this.showFilteredData();
     });
@@ -335,7 +337,7 @@ export class EntityToEntityMappingComponent implements OnInit {
    * @param editMappingForm Edit Mapping Form Id
    */
   submitEdit(editMappingForm: any) {
-    const dateFormat = 'dd MMMM yyyy';
+    const dateFormat = this.settingsService.dateFormat;
 
     const startDate: Date = editMappingForm.value.startDate;
     const endDate: Date = editMappingForm.value.endDate;
@@ -346,7 +348,7 @@ export class EntityToEntityMappingComponent implements OnInit {
     });
     const newMappingData = editMappingForm.value;
     newMappingData.dateFormat = dateFormat;
-    newMappingData.locale = 'en';
+    newMappingData.locale = this.settingsService.language.code;
     this.systemService.editMapping(this.mapIdToEdit, newMappingData).subscribe((response: any) => {
       this.showFilteredData();
     });