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 d9d87bc0b..b91f3358e 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -50,6 +50,9 @@ export class EditEventPage implements OnInit {
     private toastService: ToastService,
     private router: Router,
   ) {
+
+
+
     this.isEventEdited = false;
     this.postEvent = this.navParams.get('event');
     this.caller = this.navParams.get('caller');
diff --git a/src/app/pages/events/edit-event/edit-event.page.ts b/src/app/pages/events/edit-event/edit-event.page.ts
index 787ae3e99..22b43307b 100644
--- a/src/app/pages/events/edit-event/edit-event.page.ts
+++ b/src/app/pages/events/edit-event/edit-event.page.ts
@@ -48,6 +48,7 @@ export class EditEventPage implements OnInit {
     private iab: InAppBrowser) { 
       this.loadedEvent = new Event();
       this.loadedEvent.Body = new EventBody();
+      
     }
 
   ngOnInit() {
diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html
index 5ccb062a9..c63aa3c63 100644
--- a/src/app/pages/login/login.page.html
+++ b/src/app/pages/login/login.page.html
@@ -1,6 +1,6 @@
 <ion-content class="text-white">
   <div class="main-wrapper">
-    <div class="wrapper"  *ngIf="!hasSession || enterWithPassword">
+    <div class="wrapper"  *ngIf="!hasSession && !setPin || loginPreference == 'none' && !setPin ">
 
       <div class="bg-1 d-flex justify-center align-center">
         <div class="bg-2 d-flex justify-center align-center">
@@ -32,7 +32,7 @@
       </div>
     </div>
 
-    <div class="main-content  height-100" *ngIf="hasSession && !enterWithPassword">
+    <div class="main-content  height-100" *ngIf="setPin || hasSession && loginPreference == 'pin' ">
       <div class=" align-center justify-center">
         <div class="div-top-header">
 
@@ -74,7 +74,7 @@
           Entrar com senha
         </div>
 
-        <div  *ngIf="setPint" class="voltar d-flex align-center justify-center pt-25 clear" (click)="clearCode()">
+        <div class="voltar d-flex align-center justify-center pt-25 clear" (click)="clearCode()">
           Limpar
         </div>
 
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 3ab3f920b..d59e0bcad 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -24,7 +24,7 @@ export class LoginPage implements OnInit {
   hasPin:  boolean
   loginPreference: string
   hasSession = false
-  enterWithPassword = false
+  setPin = false
 
 
   constructor(
@@ -35,35 +35,37 @@ export class LoginPage implements OnInit {
     public alertController: AlertController
   ) { 
 
-    // App has session
-    if(!localStorage.getItem('UserData')) {
-      this.hasSession = false
-    } else {
-      this.hasSession = true
-      // this.router.navigate(['/home/events']);
-    }
-
-    let userData = JSON.parse(localStorage.getItem('UserData')) || {}
-
-    const loginPreference = userData?.loginPreference
-    const pin = userData?.PIN
-
-    if (pin) {
-      this.hasPin = true    
-    } else {
-      this.hasPin = false
-    }
-
-    if (loginPreference) {
-      this.loginPreference = loginPreference
-
-    } else {
-      this.loginPreference = ''
-    }
-
   }
 
-  ngOnInit() {}
+  ngOnInit() {
+    
+  // App has session
+  if(!localStorage.getItem('UserData')) {
+    this.hasSession = false
+  } else {
+    this.hasSession = true
+    // this.router.navigate(['/home/events']);
+  }
+
+  let userData = JSON.parse(localStorage.getItem('UserData')) || {}
+
+  const loginPreference = userData?.loginPreference
+  const pin = userData?.PIN
+
+  if (pin) {
+    this.hasPin = true    
+  } else {
+    this.hasPin = false
+  }
+
+  if (loginPreference) {
+    this.loginPreference = loginPreference
+
+  } else {
+    this.loginPreference = ''
+  }
+
+  }
 
   //Function to validade the login inputs
   validateUsername() {
@@ -128,9 +130,9 @@ export class LoginPage implements OnInit {
           this.getToken();
           this.hasSession = true
           this.hasPin = false
-          this.enterWithPassword = false
+          this.setPin = true
 
-          if(!this.hasPin) {
+          if(!this.hasPin || this.hasPin) {
           } else {
             this.router.navigate(['/home/events']);
           }
@@ -180,7 +182,7 @@ export class LoginPage implements OnInit {
 
     let userData = JSON.parse(localStorage.getItem('UserData')) || {}
     const pin = userData?.PIN
-    
+
     //if( encrypted == pin) {
       
     if( encrypted == localStorage.getItem('PIN')) {
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
index 6749127ed..85c459244 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
@@ -117,6 +117,8 @@ export class EditEventToApprovePage implements OnInit {
   ) {
     this.isEventEdited = false;
 
+    alert('nice!!___')
+
   }
 
   ngOnInit() {
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html
index 0d792ce3e..00cfca146 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.html
+++ b/src/app/shared/agenda/edit-event/edit-event.page.html
@@ -40,7 +40,7 @@
         </div>
         <div class="ion-input-class flex-grow-1">
 
-          <mat-form-field floatLabel="never" class="width-100" >
+          <mat-form-field appearance="none" floatLabel="never" class="width-100 " >
             <mat-select placeholder="Selecione agenda*" [(ngModel)]="postEvent.CalendarName" >
               <mat-option value="Oficial">
                 Oficial
@@ -62,7 +62,7 @@
         </div>
         <div class="ion-input-class flex-grow-1">
 
-          <mat-form-field floatLabel="never" class="width-100" required>
+          <mat-form-field appearance="none" floatLabel="never" class="width-100" required>
             <!-- <input matInput type="text" > -->
             <mat-select placeholder="Selecione o tipo de evento*" matInput [(ngModel)]="postEvent.Categories[0]" >
               <mat-option value="Reunião">
@@ -91,7 +91,7 @@
         </div>
         <div class="ion-input-class flex-grow-1">
 
-          <mat-form-field floatLabel="never" class="date-hour-picker">
+          <mat-form-field appearance="none" floatLabel="never" floatLabel="never" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1" 
               placeholder="Choose a date" 
               [formControl]="dateControlStart"
@@ -119,7 +119,7 @@
         </div>
         <div class="ion-input-class flex-grow-1">
 
-          <mat-form-field floatLabel="never" class="date-hour-picker">
+          <mat-form-field appearance="none" floatLabel="never" floatLabel="never" class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="fim" 
               placeholder="Choose a date" 
               [formControl]="dateControlEnd"
@@ -147,7 +147,7 @@
         </div>
         <div class="ion-input-class flex-grow-1">
 
-          <mat-form-field floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
+          <mat-form-field appearance="none" floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
             <mat-select placeholder="Selecione repetição*" [(ngModel)]="postEvent.IsRecurring">
               <mat-option value="false">
                 Não se repete
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.scss b/src/app/shared/agenda/edit-event/edit-event.page.scss
index 285021125..e91c29131 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.scss
+++ b/src/app/shared/agenda/edit-event/edit-event.page.scss
@@ -201,4 +201,10 @@ ion-content{
   .close-button {
     display: block !important;
   }
+}
+
+
+
+.materia-top {
+  padding-top: 7px;
 }
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
index 406b8384c..edb71b1cd 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
@@ -122,6 +122,8 @@ export class EditEventToApproveComponent implements OnInit {
     private animationController: AnimationController,
     private toastService: ToastService,
   ) {
+    // Edit event to approve
+    alert('nice!!___')
 
     this.serialNumber = this.navParams.get('serialNumber');
 
diff --git a/src/global.scss b/src/global.scss
index d13cdf552..a205e26e5 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -995,4 +995,12 @@ background: rgb(92, 92, 92);
     margin-top: -16px;
     margin-bottom: 10px;
     font-size: 11pt;
-}
\ No newline at end of file
+}
+
+
+.mat-selected {
+    background-color: #87cefa !important;
+    span {
+        color: white !important;
+    }
+}