diff --git a/jslib b/jslib
index 983a7b47..35039fda 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 983a7b474c344475edc3290d0ce1894a92794752
+Subproject commit 35039fdae2038f6bdfbdef6616b2bfae0053d47b
diff --git a/src/main.ts b/src/main.ts
index 4bbae4ed..b328d6d8 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,14 +1,13 @@
 import { app, BrowserWindow } from 'electron';
 import * as path from 'path';
 
-// import { ElectronMainMessagingService } from 'jslib/electron/services/desktopMainMessaging.service';
-
 import { MenuMain } from './main/menu.main';
 import { MessagingMain } from './main/messaging.main';
 import { I18nService } from './services/i18n.service';
 
 import { KeytarStorageListener } from 'jslib/electron/keytarStorageListener';
 import { ElectronLogService } from 'jslib/electron/services/electronLog.service';
+import { ElectronMainMessagingService } from 'jslib/electron/services/electronMainMessaging.service';
 import { ElectronStorageService } from 'jslib/electron/services/electronStorage.service';
 import { WindowMain } from 'jslib/electron/window.main';
 
@@ -16,6 +15,7 @@ export class Main {
     logService: ElectronLogService;
     i18nService: I18nService;
     storageService: ElectronStorageService;
+    messagingService: ElectronMainMessagingService;
     keytarStorageListener: KeytarStorageListener;
 
     windowMain: WindowMain;
@@ -49,11 +49,13 @@ export class Main {
         this.logService = new ElectronLogService(null, app.getPath('userData'));
         this.i18nService = new I18nService('en', './locales/');
         this.storageService = new ElectronStorageService();
-        // this.messagingService = new DesktopMainMessagingService(this);
 
         this.windowMain = new WindowMain(this.storageService);
-        this.menuMain = new MenuMain(this);
         this.messagingMain = new MessagingMain(this.windowMain);
+        this.menuMain = new MenuMain(this);
+        this.messagingService = new ElectronMainMessagingService(this.windowMain, (message) => {
+            this.messagingMain.onMessage(message);
+        });
 
         this.keytarStorageListener = new KeytarStorageListener('Bitwarden Directory Connector');
     }
diff --git a/src/main/menu.main.ts b/src/main/menu.main.ts
index bbdc4e28..77a8f838 100644
--- a/src/main/menu.main.ts
+++ b/src/main/menu.main.ts
@@ -22,7 +22,7 @@ export class MenuMain extends BaseMenu {
 
     constructor(private main: Main) {
         super(main.i18nService, main.windowMain, main.i18nService.t('bitwardenDirectoryConnector'),
-            () => { /* TODO: Log Out Message */ });
+            () => this.main.messagingService.send('logout'));
     }
 
     init() {
@@ -39,14 +39,10 @@ export class MenuMain extends BaseMenu {
     }
 
     private initApplicationMenu() {
-        const accountSubmenu: MenuItemConstructorOptions[] = [
-            this.logOutMenuItemOptions,
-        ];
-
         const template: MenuItemConstructorOptions[] = [
             {
                 label: this.i18nService.t('file'),
-                submenu: [ this.logOutMenuItemOptions ],
+                submenu: [this.logOutMenuItemOptions],
             },
             this.editMenuItemOptions,
             {