diff --git a/app/config/README.md b/app/config/README.md
index 5c20e52b..989f7f18 100644
--- a/app/config/README.md
+++ b/app/config/README.md
@@ -55,6 +55,11 @@ Here is the list of available arguments and its usage:
 | proxyServer                     | Proxy Server with format address:port                                                     | string                |
 | screenLockInhibitionMethod      | Screen lock inhibition method to be used (`Electron`/`WakeLockSentinel`)                      | Electron                |
 | spellCheckerLanguages           | Array of languages to use with Electron's spell checker                    | []                 |
+
+| ssoUser           | Login that will be sent for basic_auth SSO login. | string                 |
+
+| ssoPasswordCommand           | Command to execute, grab stdout and use it as a password for basic_auth SSO login. | string                 |
+
 | url                             | Microsoft Teams URL                                                                      | string                |
 | useMutationTitleLogic         | Use MutationObserver to update counter from title                                          | true               |
 | version                         | Show the version number                                                                  | false                 |
diff --git a/app/config/index.js b/app/config/index.js
index fb1581ef..f07933cb 100644
--- a/app/config/index.js
+++ b/app/config/index.js
@@ -265,6 +265,16 @@ function argv(configPath, appVersion) {
 				describe: 'Array of languages to use with Electron\'s spell checker (experimental)',
 				type: 'array'
 			},
+			ssoUser: {
+				default: '',
+				describe: 'User to use for SSO auth.',
+				type: 'string'
+			},
+			ssoPasswordCommand: {
+				default: '',
+				describe: 'Command to execute to retrieve password for SSO auth.',
+				type: 'string'
+			},
 			url: {
 				default: 'https://teams.microsoft.com/',
 				describe: 'Microsoft Teams URL',
diff --git a/app/login/index.js b/app/login/index.js
index e724cc6b..3a692cf7 100644
--- a/app/login/index.js
+++ b/app/login/index.js
@@ -1,4 +1,6 @@
 const { app, ipcMain, BrowserWindow } = require('electron');
+const { execSync } = require('child_process');
+
 let isFirstLoginTry = true;
 
 exports.loginService = function loginService(parentWindow, callback) {
@@ -31,12 +33,25 @@ exports.loginService = function loginService(parentWindow, callback) {
 	win.loadURL(`file://${__dirname}/login.html`);
 };
 
-exports.handleLoginDialogTry = function handleLoginDialogTry(window) {
+exports.handleLoginDialogTry = function handleLoginDialogTry(window, {ssoUser, ssoPasswordCommand}) {
 	window.webContents.on('login', (event, request, authInfo, callback) => {
 		event.preventDefault();
 		if (isFirstLoginTry) {
 			isFirstLoginTry = false;
-			this.loginService(window, callback);
+			if (ssoUser && ssoPasswordCommand) {
+
+				console.log(`Retrieve password using command : ${ssoPasswordCommand}`);
+
+				try {
+					const ssoPassword = execSync(ssoPasswordCommand).toString();
+					callback(ssoUser, ssoPassword);
+				} catch (error) {
+					console.error(`Failed to execute ssoPasswordCommand. Status Code: ${error.status} with '${error.message}'`);
+				}
+			} else {
+				console.debug("Using dialogue window.");
+				this.loginService(window, callback);
+			}
 		} else {
 			// if fails to authenticate we need to relanch the app as we have close the login browser window.
 			isFirstLoginTry = true;
diff --git a/app/mainAppWindow/index.js b/app/mainAppWindow/index.js
index d85afba4..d2a99ca9 100644
--- a/app/mainAppWindow/index.js
+++ b/app/mainAppWindow/index.js
@@ -73,6 +73,8 @@ exports.onAppReady = async function onAppReady(configGroup) {
 
 	addEventHandlers();
 
+	login.handleLoginDialogTry(window, {'ssoUser': config.ssoUser, 'ssoPasswordCommand': config.ssoPasswordCommand});
+
 	const url = processArgs(process.argv);
 	connMgr.start(url, {
 		window: window,
@@ -386,7 +388,6 @@ function addEventHandlers() {
 	window.webContents.session.webRequest.onBeforeRequest({ urls: ['https://*/*'] }, onBeforeRequestHandler);
 	window.webContents.session.webRequest.onHeadersReceived({ urls: ['https://*/*'] }, onHeadersReceivedHandler);
 	window.webContents.session.webRequest.onBeforeSendHeaders(getWebRequestFilterFromURL(), onBeforeSendHeadersHandler);
-	login.handleLoginDialogTry(window);
 	window.webContents.on('did-finish-load', onDidFinishLoad);
 	window.webContents.on('did-frame-finish-load', onDidFrameFinishLoad);
 	window.on('closed', onWindowClosed);
diff --git a/package.json b/package.json
index e4dbece0..ebecd505 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "teams-for-linux",
-  "version": "1.4.39",
+  "version": "1.4.40",
   "main": "app/index.js",
   "description": "Unofficial client for Microsoft Teams for Linux",
   "homepage": "https://github.com/IsmaelMartinez/teams-for-linux",