diff --git a/src/app/components/facebook-login/facebook-login.component.html b/src/app/components/facebook-login/facebook-login.component.html
index 90c654f..02114ef 100644
--- a/src/app/components/facebook-login/facebook-login.component.html
+++ b/src/app/components/facebook-login/facebook-login.component.html
@@ -7,10 +7,9 @@
     
     
     <section class="social-login" [ngClass]="{'active' : showLogout && user }">
-        <section class="login-box">
+        <section class="login-box" *ngIf="user">
             <button (click)="logout()"> 
-                Logout from "{{ user.name }}"?
-                <ion-icon name="logo-facebook"></ion-icon>
+                Logout & Exit from "{{ user.name }}"?                
             </button>
             <button (click)="showLogout = false">
                 <ion-icon name="close-circle-outline"></ion-icon>
diff --git a/src/app/components/facebook-login/facebook-login.component.ts b/src/app/components/facebook-login/facebook-login.component.ts
index 2fce4a5..51ce792 100644
--- a/src/app/components/facebook-login/facebook-login.component.ts
+++ b/src/app/components/facebook-login/facebook-login.component.ts
@@ -7,6 +7,7 @@ import { HttpClient } from '@angular/common/http';
 import { FacebookLoginPlugin } from '@capacitor-community/facebook-login';
 import { FacebookLogin } from '@capacitor-community/facebook-login';
 registerWebPlugin(FacebookLogin);
+const { App } = Plugins;
 
 @Component({
   selector: 'app-facebook-login',
@@ -26,9 +27,10 @@ export class FacebookLoginComponent implements OnInit {
     constructor(
         private platform: Platform,
         private http: HttpClient
-    ) { }
+    ) {        
+    }
 
-    ngOnInit() {
+    ngAfterViewInit() {
         if (localStorage.getItem('FBUser') && localStorage.getItem('FBToken')) {
             this.user = JSON.parse(localStorage.getItem('FBUser'));
             this.token = localStorage.getItem('FBToken');
@@ -37,6 +39,10 @@ export class FacebookLoginComponent implements OnInit {
         }
     }
 
+    ngOnInit() {
+        
+    }
+
     async setupFbLogin() {
         if (this.platform.is('android') || this.platform.is('capacitor')) {            
             // Use the native implementation inside a real app!
@@ -95,6 +101,7 @@ export class FacebookLoginComponent implements OnInit {
         this.token = null;
         localStorage.removeItem('FBUser');
         localStorage.removeItem('FBToken');
+        App.exitApp();
     }
 
 }