diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index ffa971123..238d050e8 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -16,19 +16,43 @@
       <ion-item-sliding class="overflow-y-auto">
   
         <div class="px-20">
-          <div class="ion-item-container width-100">
+          <div class="ion-item-container width-100" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
             <ion-input  placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
           </div>
+
+          
+          <div *ngIf="Form && validateFrom" >
+            <div *ngIf="Form.get('Subject').invalid " class="input-errror-message">
+              <div *ngIf="Form.get('Subject').errors?.required">
+                Campo obrigatório.
+              </div>
+              <div *ngIf="Form.get('Subject').errors?.minlength">
+                O campo deve ter pelo menos 4 caracteres.
+              </div>
+            </div>
+          </div>
+
           <div class="container-div width-100">
             <div class="ion-item-class-2">
               <div class="ion-icon-class">
                 <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
               </div>
-              <div class="ion-input-class">
+              <div class="ion-input-class" [class.input-error]="Form?.get('Location')?.invalid  && validateFrom ">
                 <ion-input placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
               </div>
             </div>
           </div>
+
+          <div *ngIf="Form && validateFrom" >
+            <div *ngIf="Form.get('Location').invalid " class="input-errror-message">
+              <div *ngIf="Form.get('Location').errors?.required">
+                Campo obrigatório.
+              </div>
+              <div *ngIf="Form.get('Location').errors?.minlength">
+                O campo deve ter pelo menos 4 caracteres.
+              </div>
+            </div>
+          </div>
         
           <div class="container-div width-100">
             <div class="ion-item-class-2">
@@ -47,13 +71,22 @@
               </div>
             </div>
           </div>
+
+          <div *ngIf="Form && validateFrom" >
+            <div *ngIf="Form.get('CalendarName').invalid " class="input-errror-message">
+              {{ postEvent.Categories[0] }}
+              <div *ngIf="Form.get('CalendarName').errors?.required">
+                Campo obrigatório.
+              </div>
+            </div>
+          </div>
     
           <div class="container-div width-100">
             <div class="ion-item-class-2">
               <div class="ion-icon-class">
                 <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
               </div>
-              <div class="ion-input-class">
+              <div class="ion-input-class" [class.input-error]="Form?.get('Categories')?.invalid  && validateFrom ">
                 <ion-select  placeholder="Selecione tipo de evento*" 
                 [(ngModel)]="postEvent.Categories[0]"
                 selectedText="{{postEvent.Categories[0]}}"
@@ -67,6 +100,15 @@
               </div>
             </div>
           </div>
+
+          <div *ngIf="Form && validateFrom" >
+            <div *ngIf="Form.get('Categories').invalid " class="input-errror-message">
+              {{ postEvent.Categories[0] }}
+              <div *ngIf="Form.get('Categories').errors?.required">
+                Campo obrigatório.
+              </div>
+            </div>
+          </div>
         
           <div class="container-div width-100">
             <div class="ion-item-class-2 width-100">
@@ -80,8 +122,7 @@
                   displayFormat="D MMM YYYY H:mm"
                   minuteValues="0,15,30,45"
                   monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
-                  min="2018" 
-                  max="2022" 
+                  min="minDate" 
                 >
                 </ion-datetime>
                 <!-- <ion-input placeholder="Data início" [(ngModel)]="postData.StartDate"></ion-input> -->
@@ -102,7 +143,6 @@
                   minuteValues="0,15,30,45"
                   monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
                   min="2018" 
-                  max="2022" 
                 >
                 </ion-datetime>
                 <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index b91f3358e..a958c4bd8 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Router } from '@angular/router';
 import { AlertController, AnimationController, ModalController, NavParams } from '@ionic/angular';
 import { Attachment } from 'src/app/models/attachment.model';
@@ -18,6 +19,10 @@ import { SearchPage } from '../../search/search.page';
 })
 export class EditEventPage implements OnInit {
 
+
+  Form: FormGroup;
+  validateFrom = false
+  
   postEvent: Event;
   isRecurring:string;
   isEventEdited: boolean;
@@ -115,7 +120,45 @@ export class EditEventPage implements OnInit {
     this.router.navigate(['/home',this.caller]);
   }
 
+
+  runValidation() {
+    this.validateFrom  = true
+  }
+
+  injectValidation() {
+
+    this.Form = new FormGroup({
+      Subject: new FormControl(this.postEvent.Subject, [
+        Validators.required,
+        // Validators.minLength(4)
+      ]),
+      Location: new FormControl(this.postEvent.Location, [
+        Validators.required,
+      ]),
+      CalendarName: new FormControl(this.postEvent.CalendarName, [
+        Validators.required
+      ]),
+      Categories: new FormControl(this.postEvent.Categories[0], [
+        Validators.required
+      ]),
+      IsRecurring: new FormControl(this.postEvent.IsRecurring, [
+        Validators.required
+      ]),
+      // participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
+      //   Validators.required
+      // ]),
+
+    })
+  }
+  
+
   save() {
+    
+    this.injectValidation()
+    this.runValidation()
+
+    if(this.Form.invalid) return false
+    
     this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc)
     try{
       this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index 980f320cf..cc79a31c1 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -14,15 +14,28 @@
   <div class="main-content">
     <!-- <input type="text" ngbDatepicker #d="ngbDatepicker"/> -->
     
-    <div class="ion-item-container">
+    <div class="ion-item-container" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
       <ion-input  placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
     </div>
+
+
+    <div *ngIf="Form && validateFrom" >
+      <div *ngIf="Form.get('Subject').invalid " class="input-errror-message">
+        <div *ngIf="Form.get('Subject').errors?.required">
+          Campo obrigatório.
+        </div>
+        <div *ngIf="Form.get('Subject').errors?.minlength">
+          O campo deve ter pelo menos 4 caracteres.
+        </div>
+      </div>
+    </div>
+
     <div class="container-div">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
         </div>
-        <div class="ion-input-class">
+        <div class="ion-input-class" [class.input-error]="Form?.get('Location')?.invalid  && validateFrom ">
           <ion-input placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
         </div>
       </div>
@@ -32,13 +45,24 @@
       </span> -->
   
     </div>
+
+    <div *ngIf="Form && validateFrom" >
+      <div *ngIf="Form.get('Location').invalid " class="input-errror-message">
+        <div *ngIf="Form.get('Location').errors?.required">
+          Campo obrigatório.
+        </div>
+        <div *ngIf="Form.get('Location').errors?.minlength">
+          O campo deve ter pelo menos 4 caracteres.
+        </div>
+      </div>
+    </div>
   
     <div class="container-div">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
-        <div class="ion-input-class">
+        <div class="ion-input-class" [class.input-error]="Form?.get('CalendarName')?.invalid  && validateFrom ">
           <ion-select  placeholder="Selecione agenda*"
           selectedText="{{postEvent.CalendarName}}" 
           [(ngModel)]="postEvent.CalendarName" 
@@ -51,12 +75,21 @@
       </div>
     </div>
 
+    <div *ngIf="Form && validateFrom" >
+      <div *ngIf="Form.get('CalendarName').invalid " class="input-errror-message">
+        {{ postEvent.Categories[0] }}
+        <div *ngIf="Form.get('CalendarName').errors?.required">
+          Campo obrigatório.
+        </div>
+      </div>
+    </div>
+
     <div class="container-div">
       <div class="ion-item-class-2">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
         </div>
-        <div class="ion-input-class">
+        <div class="ion-input-class" [class.input-error]="Form?.get('Categories')?.invalid  && validateFrom ">
           <ion-select  placeholder="Selecione tipo de evento*" 
           [(ngModel)]="postEvent.Categories[0]" 
           interface="action-sheet" 
@@ -69,6 +102,15 @@
         </div>
       </div>
     </div>
+
+    <div *ngIf="Form && validateFrom" >
+      <div *ngIf="Form.get('Categories').invalid " class="input-errror-message">
+        {{ postEvent.Categories[0] }}
+        <div *ngIf="Form.get('Categories').errors?.required">
+          Campo obrigatório.
+        </div>
+      </div>
+    </div>
   
     <div class="container-div">
       <div class="ion-item-class-2">
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts
index 9af991193..b3490dfba 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -12,6 +12,10 @@ import { ToastService } from 'src/app/services/toast.service';
 import { Event } from '../../../models/event.model';
 import { AttendeesPageModal } from '../../events/attendees/attendees.page';
 import { SearchPage } from '../../search/search.page';
+import { ThemePalette } from '@angular/material/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import * as moment from 'moment';
+
 
 @Component({
   selector: 'app-new-event',
@@ -20,6 +24,23 @@ import { SearchPage } from '../../search/search.page';
 })
 
 export class NewEventPage implements OnInit {
+  // date picker
+  public date: any;
+  public disabled = false;
+  public showSpinners = true;
+  public showSeconds = false;
+  public touchUi = false;
+  public enableMeridian = false;
+  public minDate = new Date();
+  public endMinDate = new Date(new Date().getTime() + 15 * 60000);
+  public stepHour = 1;
+  public stepMinute = 5;
+  public stepSecond = 5;
+  public color: ThemePalette = 'primary';
+
+  Form: FormGroup;
+  validateFrom = false
+
   postEvent: Event;
   eventBody: EventBody;
   segment:string = "true";
@@ -27,7 +48,6 @@ export class NewEventPage implements OnInit {
   eventAttendees: EventPerson[];
   selectedSegment: string;
   selectedDate: Date;
-  minDate: string;
 
   adding: "intervenient" | "CC";
 
@@ -65,7 +85,6 @@ export class NewEventPage implements OnInit {
     let selectedEndDate = new Date(this.selectedDate);
     /* Set + 30minutes to seleted datetime */
     selectedEndDate.setMinutes(this.selectedDate.getMinutes() + 30) ;    
-    this.minDate = this.selectedDate.toString();
     
     if(this.selectedSegment != "Combinada"){
       this.postEvent ={
@@ -122,9 +141,44 @@ export class NewEventPage implements OnInit {
     this.modalController.dismiss();
   }
   
+
+  runValidation() {
+    this.validateFrom  = true
+  }
+
+  injectValidation() {
+
+    this.Form = new FormGroup({
+      Subject: new FormControl(this.postEvent.Subject, [
+        Validators.required,
+        // Validators.minLength(4)
+      ]),
+      Location: new FormControl(this.postEvent.Location, [
+        Validators.required,
+      ]),
+      CalendarName: new FormControl(this.postEvent.CalendarName, [
+        Validators.required
+      ]),
+      Categories: new FormControl(this.postEvent.Categories[0], [
+        Validators.required
+      ]),
+      IsRecurring: new FormControl(this.postEvent.IsRecurring, [
+        Validators.required
+      ]),
+      // participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
+      //   Validators.required
+      // ]),
+
+    })
+  }
+  
   async save() {
-  /*     console.log(this.postEvent);
-    console.log(this.profile); */
+    this.injectValidation()
+    this.runValidation()
+
+    if(this.Form.invalid) return false
+
+    console.log('passed')
   
     if(this.documents.length >= 0) {
       this.postEvent.HasAttachments = true;
diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html
index 45065d2a9..ca7e4a003 100644
--- a/src/app/pages/login/login.page.html
+++ b/src/app/pages/login/login.page.html
@@ -71,7 +71,7 @@
           
         </div>
     
-        <div *ngIf="hasPin" class="voltar d-flex align-center justify-center pt-25 clear" (click)="enterWithPassword=true">
+        <div *ngIf="hasPin" class="voltar d-flex align-center justify-center pt-25 clear" (click)="loginPreference = 'none'">
           Entrar com senha
         </div>
 
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index 55376a244..1ca114dfa 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -118,7 +118,7 @@
             <input matInput [ngxMatDatetimePicker]="picker1" 
               placeholder="Choose a date" 
               [formControl]="dateControlStart"
-              [min]="minDate" [max]="maxDate" 
+              [min]="minDate"
               [disabled]="disabled"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
@@ -193,7 +193,7 @@
     <div *ngIf="Form && validateFrom" >
       <div *ngIf="Form.get('participantes').invalid " class="input-errror-message">
         <div *ngIf="Form.get('participantes').errors?.required">
-          Adicionar participant.
+          Adicionar participante.
         </div>
       </div>
     </div>
diff --git a/src/app/shared/headers/header-no-search/profile/profile.page.html b/src/app/shared/headers/header-no-search/profile/profile.page.html
index 0d6d6415b..78759ad91 100644
--- a/src/app/shared/headers/header-no-search/profile/profile.page.html
+++ b/src/app/shared/headers/header-no-search/profile/profile.page.html
@@ -30,7 +30,6 @@
       <ion-row>
         <ion-col class="align-center d-flex">
           <div class="d-flex align-center"  (click)="LoginPreferenceMethod('pin')">
-            <!--  -->
             <ion-checkbox [checked]="userLoginPreference=='pin' " class="checkBox" ></ion-checkbox>
             PIN 
           </div>
diff --git a/src/app/shared/headers/header-no-search/profile/profile.page.ts b/src/app/shared/headers/header-no-search/profile/profile.page.ts
index d578dba59..23bd43dd5 100644
--- a/src/app/shared/headers/header-no-search/profile/profile.page.ts
+++ b/src/app/shared/headers/header-no-search/profile/profile.page.ts
@@ -14,7 +14,7 @@ import { PinPage } from 'src/app/shared/pin/pin.page';
 export class ProfileComponent implements OnInit {
 
   loggeduser: User;
-  userLoginPreference: boolean
+  userLoginPreference = ''
 
   constructor(private modalController:ModalController,
     private authService: AuthService,
@@ -140,7 +140,7 @@ export class ProfileComponent implements OnInit {
     if (userData.hasOwnProperty('loginPreference')) {
       this.userLoginPreference = userData.loginPreference
     } else {
-      this.userLoginPreference = false
+      this.userLoginPreference =  ''
     }
     
   }