diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index f09fe0f9e..039db1710 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -169,15 +169,12 @@ export class AgendaPage implements OnInit {
               this.myCal.update();
               this.myCal.loadEvents();
               this.showLoader = false;
-            }
-          );
+            });
         }
         else{
-          this.eventService.getAllPrEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => {
-            this.prEventList = res;
-            this.eventService.getAllMdEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => {
-              this.mdEventList = res;
-              this.eventsList = this.prEventList.concat(this.mdEventList);
+          this.eventService.getAllPrEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(
+            response => {
+              this.eventsList = response;
               this.eventsList.forEach(element => {
                 this.eventSource.push({
                   title: element.Subject,
@@ -191,7 +188,6 @@ export class AgendaPage implements OnInit {
               this.myCal.loadEvents();
               this.showLoader = false;
             });
-          });
         }
       break;
 
@@ -213,27 +209,22 @@ export class AgendaPage implements OnInit {
               this.myCal.update();
               this.myCal.loadEvents();
               this.showLoader = false;
-            }
-          );
-        }else{
-          this.eventService.getAllPrEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => {
-            this.prEventList = res;
-            this.eventService.getAllMdEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => {
-              this.mdEventList = res;
-              this.eventsListPessoal = this.prEventList.concat(this.mdEventList).filter(data => data.CalendarName == "Pessoal");
-              this.eventsListPessoal.forEach(element => {
-                this.eventSource.push({
-                  title: element.Subject,
-                  startTime: new Date(element.StartDate),
-                  endTime: new Date(element.EndDate),
-                  allDay: false,
-                  event: element
-                });
-              });
-              this.myCal.update();
-              this.myCal.loadEvents();
-              this.showLoader = false;
             });
+        }else{
+          this.eventService.getAllPrEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(response => {
+            this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal");;
+            this.eventsListPessoal.forEach(element => {
+              this.eventSource.push({
+                title: element.Subject,
+                startTime: new Date(element.StartDate),
+                endTime: new Date(element.EndDate),
+                allDay: false,
+                event: element
+              });
+            });
+            this.myCal.update();
+            this.myCal.loadEvents();
+            this.showLoader = false;
           });
         }
         
@@ -257,27 +248,22 @@ export class AgendaPage implements OnInit {
               this.myCal.update();
               this.myCal.loadEvents();
               this.showLoader = false;
-            }
-          );
+            });
         }else{
           this.eventService.getAllPrEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => {
-            this.prEventList = res;
-            this.eventService.getAllMdEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => {
-              this.mdEventList = res;
-              this.eventsListOficial = this.prEventList.concat(this.mdEventList).filter(data => data.CalendarName == "Pessoal");
-              this.eventsListOficial.forEach(element => {
-                this.eventSource.push({
-                  title: element.Subject,
-                  startTime: new Date(element.StartDate),
-                  endTime: new Date(element.EndDate),
-                  allDay: false,
-                  event: element
-                });
+            this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial");
+            this.eventsListOficial.forEach(element => {
+              this.eventSource.push({
+                title: element.Subject,
+                startTime: new Date(element.StartDate),
+                endTime: new Date(element.EndDate),
+                allDay: false,
+                event: element
               });
-              this.myCal.update();
-              this.myCal.loadEvents();
-              this.showLoader = false;
             });
+            this.myCal.update();
+            this.myCal.loadEvents();
+            this.showLoader = false;
           });
         }
         
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 857012eee..7f62c5607 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -88,17 +88,12 @@ export class EventsPage implements OnInit {
             this.eventsList = res;
             this.showLoader = false;
            });
-
-
         }else{
           this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
-            this.prEventList = res;
-            this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
-              this.mdEventList = res;
-              this.eventsList = this.prEventList.concat(this.mdEventList);
+              this.eventsList = res;
               console.log(this.eventsList);
               this.showLoader = false;
-            });
+           
           });
         }
         
@@ -111,14 +106,9 @@ export class EventsPage implements OnInit {
          });
         }else{
           this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
-            this.prEventList = res;
-            this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
-              this.mdEventList = res;
-              this.personaleventsList = this.prEventList.concat(this.mdEventList).filter(data => data.CalendarName == "Pessoal");
-              console.log(this.personaleventsList);
-              this.showLoader = false;
-            });
-          });
+            this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal");
+            this.showLoader = false;
+           });
         }
         
         break;
@@ -130,14 +120,9 @@ export class EventsPage implements OnInit {
            });
         }else{
           this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
-            this.prEventList = res;
-            this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
-              this.mdEventList = res;
-              this.officialeventsList = this.prEventList.concat(this.mdEventList).filter(data => data.CalendarName == "Oficial");
-              console.log(this.officialeventsList);
-              this.showLoader = false;
-            });
-          });
+            this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");;
+            this.showLoader = false;
+           });
         } 
         break;
     }
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
index 4af42535e..ecb887568 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
@@ -20,6 +20,11 @@
         <ion-input placeholder="Localização" [(ngModel)]="postData.Location"></ion-input>
       </div>
     </div>
+    <!-- Error messages -->
+    <span class="error ion-padding" *ngIf="formLocationSatus">
+      Campo obrigatório
+    </span>
+
   </div>
 
   <div class="container-div">
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
index c83b7b270..8045276c1 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
@@ -133,4 +133,15 @@ font-size: 13px;
   margin: 0px 15px 15px 0px;
   padding: 0 !important;
   border-radius: 5px;
+}
+
+/* Error Messages */
+.error{
+  color:red;
+  font-size: 12px;
+  font-weight: bold;
+  padding-bottom: 20px;
+}
+.span-color{
+  color:red;
 }
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index e9a1b8f15..34977d280 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -25,6 +25,8 @@ export class BookMeetingModalPage implements OnInit {
   eventBody: EventBody;
   eventAttendees: EventPerson[];
 
+  formLocationSatus: boolean = false;
+
   constructor(
     private modalController: ModalController,
     private router:Router,
@@ -179,5 +181,11 @@ export class BookMeetingModalPage implements OnInit {
 
     modal.onDidDismiss();
   }
+  validateFormInputs(){
+    let formLocation = this.postData.Location.trim();
+    if(!this.postData.Location && formLocation.length <= 0){
+      this.formLocationSatus=true;
+    }
+  }
 
 }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index dcaf75bab..4b92544cb 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -7,7 +7,7 @@ export const environment = {
   apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/',
   apiChatUrl: 'http://192.168.100.111:3000/api/v1/',
   domain: 'gabinetedigital.local',
-  defaultuser: '',
+  defaultuser: 'paulo.pinto',
   defaultuserpwd: 'tabteste@006'
 };