diff --git a/app/converse-plugins/desktop-credentials.js b/app/converse-plugins/desktop-credentials.js
index b3ac722..7a0f831 100644
--- a/app/converse-plugins/desktop-credentials.js
+++ b/app/converse-plugins/desktop-credentials.js
@@ -9,7 +9,7 @@ converse.plugins.add('converse-desktop-credentials', {
         api.listen.on('afterResourceBinding', () => {
             if (_converse.connection.pass) {
                 credentials.addCredentials(
-                    converse.connectionManager,
+                    _converse.connection.service,
                     _converse.bare_jid,
                     _converse.connection.pass
                 );
diff --git a/main.js b/main.js
index 9db4339..8c9d5d3 100644
--- a/main.js
+++ b/main.js
@@ -33,7 +33,7 @@ function createWindow () {
     }
 
     // Create the browser window.
-    app.mainWindow = mainWindow = new BrowserWindow(mainWindowOptions)
+    mainWindow = new BrowserWindow(mainWindowOptions)
     mainWindow.maximize();
 
     // Init tray
diff --git a/modules/menu-service.js b/modules/menu-service.js
index ae51dd5..4e18122 100644
--- a/modules/menu-service.js
+++ b/modules/menu-service.js
@@ -3,7 +3,6 @@
  */
 const {app, Menu, MenuItem, BrowserWindow} = require('electron')
 const settingsService = require(__dirname + '/../modules/settings-service')
-const prompt = require('electron-prompt');
 
 const menuService = {}
 
@@ -32,26 +31,6 @@ menuService.createMenu = () => {
                     settingsService.set('minimizeOnClose', converse.getMenuItemById('minimize-on-close').checked);
                 }
             },
-            {
-                label: 'Connection Manager...',
-                click: () => {
-                    let currentValue = settingsService.get('connectionManager') || '';
-                    prompt({
-                        title: 'Connection manager'
-                        , label: 'Connection manager URL:'
-                        , value: currentValue
-                        , resizable: true
-                        , width: 620
-                        , height: 180
-                    }, app.mainWindow).then(function (newValue) {
-                        if (newValue !== null && newValue !== currentValue) {
-                            settingsService.set('connectionManager', newValue === '' ? null : newValue);
-                            app.mainWindow.reload()
-                        }
-                    }).catch(function (ex) {
-                    });
-                }
-            },
             {
                 type: 'separator',
             },
diff --git a/package.json b/package.json
index 00292c7..2829372 100644
--- a/package.json
+++ b/package.json
@@ -29,12 +29,11 @@
     "eslint": "^8.4.1"
   },
   "dependencies": {
-    "converse.js": "conversejs/converse.js#cb0b176",
+    "converse.js": "conversejs/converse.js#d570b60",
     "electron-settings": "^4.0.2",
     "github-buttons": "^2.8.0",
     "keytar": "^7.3.0",
-    "open-iconic": "^1.1.1",
-    "electron-prompt": "^1.7.0"
+    "open-iconic": "^1.1.1"
   },
   "build": {
     "appId": "com.denry.converse-desktop",
diff --git a/setup.js b/setup.js
index 7337cde..1a97860 100644
--- a/setup.js
+++ b/setup.js
@@ -7,8 +7,6 @@ async function initialize () {
     let websocket_url, bosh_service_url;
     const { connectionManager, login, password } = await getCredentials()
 
-    converse.connectionManager = connectionManager;
-
     if (connectionManager?.startsWith('ws')) {
         websocket_url = connectionManager
     } else if (connectionManager?.startsWith('http')) {
@@ -41,6 +39,7 @@ async function initialize () {
         view_mode: 'fullscreen',
         websocket_url,
         whitelisted_plugins: ['converse-debug', 'converse-desktop-credentials', 'converse-desktop-trayicon'],
+        show_connection_url_input: true
     });
 }