diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html
index c63aa3c63..45065d2a9 100644
--- a/src/app/pages/login/login.page.html
+++ b/src/app/pages/login/login.page.html
@@ -1,4 +1,5 @@
 <ion-content class="text-white">
+
   <div class="main-wrapper">
     <div class="wrapper"  *ngIf="!hasSession && !setPin || loginPreference == 'none' && !setPin ">
 
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index d59e0bcad..be1c7aefd 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -34,36 +34,34 @@ export class LoginPage implements OnInit {
     private toastService: ToastService,
     public alertController: AlertController
   ) { 
-
   }
 
   ngOnInit() {
     
-  // App has session
-  if(!localStorage.getItem('UserData')) {
-    this.hasSession = false
-  } else {
-    this.hasSession = true
-    // this.router.navigate(['/home/events']);
-  }
+    // 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')) || {}
+    let userData = JSON.parse(localStorage.getItem('UserData')) || {}
 
-  const loginPreference = userData?.loginPreference
-  const pin = userData?.PIN
+    const loginPreference = userData?.loginPreference
+    const pin = userData?.PIN
 
-  if (pin) {
-    this.hasPin = true    
-  } else {
-    this.hasPin = false
-  }
+    if (pin) {
+      this.hasPin = true    
+    } else {
+      this.hasPin = false
+    }
 
-  if (loginPreference) {
-    this.loginPreference = loginPreference
-
-  } else {
-    this.loginPreference = ''
-  }
+    if (loginPreference) {
+      this.loginPreference = loginPreference
+    } else {
+      this.loginPreference = ''
+    }
 
   }
 
@@ -203,6 +201,7 @@ export class LoginPage implements OnInit {
     let userData: Object = JSON.parse(localStorage.getItem('UserData')) || {}
 
     userData['PIN'] = encrypted
+    userData['loginPreference'] = 'none'
 
   
     localStorage.setItem('UserData', JSON.stringify(userData) )
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index fbfb80fbb..2e29c5ccd 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -78,12 +78,7 @@ export class DespachosPage implements OnInit {
  }
 
  goToDespacho(serialNumber:any){
-   let navigationExtras: NavigationExtras = {
-    queryParams: {
-        "serialNumber": serialNumber,
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
+    this.router.navigate(['/home/gabinete-digital/despachos',serialNumber,'gabinete-digital']);
   }
 
  notImplemented(){
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index c55e5c2e3..e0d3f51c4 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -122,12 +122,7 @@ export class ExpedientesPrPage implements OnInit {
   }
 
   goToExpediente(serialNumber:any){
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-          "serialNumber": serialNumber,
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital/expedientes-pr/expediente-pr'], navigationExtras);
+    this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
   }
 
   async viewExpedientDetail(serialNumber:any) {
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index e803456a8..4f025782c 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -148,12 +148,7 @@ export class PedidosPage implements OnInit {
   }
 
   goToPedido(serialNumber:any) {
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "serialNumber": serialNumber,
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
+    this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
   }
 
   async viewPedidoDetail(serialNumber:any) {
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index b8fe76c37..4f908b06f 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -143,38 +143,16 @@ export class PendentesPage implements OnInit {
   async viewTaskDetails(serialNumber:string, workflowName:string) {
     console.log(this.profile);
     if(workflowName == 'Despacho'){
-      this.goToDespacho(serialNumber);
+      this.router.navigate(['/home/gabinete-digital/despachos',serialNumber,'gabinete-digital']);
     }
     else if(workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento'){
-      this.goToPedido(serialNumber);
+      this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
     }
     else if(workflowName == 'Expediente'){
-      this.goToExpediente(serialNumber);
+      this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
     }
   }
 
-  goToDespacho(serialNumber:any){
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "serialNumber": serialNumber,
-        }
-      }
-      this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
-   }
-
-    goToPedido(serialNumber:any) {
-      let navigationExtras: NavigationExtras = {
-        queryParams: {
-          "serialNumber": serialNumber,
-          }
-        }
-      this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
-    }
-
-   goToExpediente(serialNumber:any){
-     this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
-    }
-
   async openDespacho(serialNumber:string){
 
     const modal = await this.modalController.create({