diff --git a/dsn/odbc_dsn.c b/dsn/odbc_dsn.c
index cfbaa169..6b4d8d4a 100644
--- a/dsn/odbc_dsn.c
+++ b/dsn/odbc_dsn.c
@@ -84,6 +84,7 @@ MADB_DsnMap DsnMap[] = {
   {&DsnKeys[14], 2, ckReconnect,          0, 0},
   {&DsnKeys[15], 2, ckConnectPrompt,      0, 0},
   {&DsnKeys[16], 2, cbCharset,            0, 0},
+  {&DsnKeys[42], 2, cbBrowserSSO,         0, 0},
   {&DsnKeys[34], 2, txtServerKey,       260, 0},
   {&DsnKeys[18], 3, txtPluginDir,       260, 0},
   {&DsnKeys[39], 3, ckNoSSPS,             0, 0},
@@ -98,7 +99,7 @@ MADB_DsnMap DsnMap[] = {
   {&DsnKeys[32], 4, cbTls13,              4, 0},
   {&DsnKeys[33], 4, cbForceTls,           0, 0},
   {&DsnKeys[27], 4, txtCrl,               0, 0},
-  {&DsnKeys[25], 4, txtTlsPeerFp,        260, 0},
+  {&DsnKeys[25], 4, txtTlsPeerFp,       260, 0},
   {&DsnKeys[26], 4, txtTlsPeerFpList,   260, 0},
   {NULL, 0, 0, 0, 0}
 };
diff --git a/dsn/odbc_dsn.rc b/dsn/odbc_dsn.rc
index 24e14d95..75ab9689 100644
--- a/dsn/odbc_dsn.rc
+++ b/dsn/odbc_dsn.rc
@@ -104,17 +104,17 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     LTEXT           "Please specify a server name and port",IDC_STATIC,9,7,130,10,0,WS_EX_TRANSPARENT
     LTEXT           "Server Name:",lblServerName,15,21,49,11,0,WS_EX_TRANSPARENT | WS_EX_RIGHT
-    LTEXT           "Please specify a user name and password to connect to SingleStore",IDC_STATIC,9,54,207,8,0,WS_EX_TRANSPARENT
-    LTEXT           "Please specify a database to use",IDC_STATIC,9,105,207,8,0,WS_EX_TRANSPARENT
-    LTEXT           "User name:",IDC_STATIC,26,70,38,8,0,WS_EX_TRANSPARENT | WS_EX_RIGHT
-    LTEXT           "Password:",IDC_STATIC,30,88,34,8,0,WS_EX_TRANSPARENT | WS_EX_RIGHT
-    LTEXT           "Database:",IDC_STATIC,20,121,34,8,0,WS_EX_TRANSPARENT | WS_EX_RIGHT
     EDITTEXT        txtServerName,71,18,141,14,ES_AUTOHSCROLL
-    EDITTEXT        txtPort,71,34,40,14,ES_AUTOHSCROLL
     LTEXT           "Port:",lblPort,15,35,49,11,0,WS_EX_TRANSPARENT | WS_EX_RIGHT
+    EDITTEXT        txtPort,71,34,40,14,ES_AUTOHSCROLL
+    LTEXT           "Please specify a user name and password to connect to SingleStore",IDC_STATIC,9,54,287,8,0,WS_EX_TRANSPARENT
+    LTEXT           "User name:",IDC_STATIC,26,70,38,8,0,WS_EX_TRANSPARENT | WS_EX_RIGHT
     EDITTEXT        txtUserName,71,68,141,14,ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,30,88,34,8,0,WS_EX_TRANSPARENT | WS_EX_RIGHT
     EDITTEXT        txtPassword,71,86,142,14,ES_PASSWORD | ES_AUTOHSCROLL
     PUSHBUTTON      "&Test DSN",pbTestDSN,223,86,50,14
+    LTEXT           "Please specify a database to use",IDC_STATIC,9,105,207,8,0,WS_EX_TRANSPARENT
+    LTEXT           "Database:",IDC_STATIC,20,121,34,8,0,WS_EX_TRANSPARENT | WS_EX_RIGHT
     COMBOBOX        cbDatabase,71,119,93,80,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "< Previous",PB_PREV,50,149,50,14
     PUSHBUTTON      "Next >",PB_NEXT,104,149,50,14
@@ -132,8 +132,9 @@ BEGIN
     CONTROL         "Enable automatic reconnect",ckReconnect,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,79,107,10,WS_EX_TRANSPARENT
     CONTROL         "Don't prompt when connecting",ckConnectPrompt,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,95,113,10,WS_EX_TRANSPARENT
 
-    COMBOBOX        cbCharset,113,110,160,80,CBS_DROPDOWN | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Connection Character Set:",IDC_STATIC,7,113,96,8,0,WS_EX_TRANSPARENT
+    COMBOBOX        cbCharset,113,110,160,80,CBS_DROPDOWN | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Use Single Sign-On Auth instead of password",cbBrowserSSO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,129,220,8,WS_EX_TRANSPARENT
 
     PUSHBUTTON      "Cancel",IDCANCEL,178,149,50,14
     PUSHBUTTON      "Next >",PB_NEXT,104,149,50,14
diff --git a/dsn/resource.h b/dsn/resource.h
index 02de987f..60f8a110 100644
--- a/dsn/resource.h
+++ b/dsn/resource.h
@@ -104,6 +104,7 @@
 #define pbCrlBrowse                     1214
 #define cbInteractive                   1220
 #define ckNoSSPS                        1221
+#define cbBrowserSSO                    1222
 
 // Next default values for new objects
 // 
diff --git a/ma_dsn.c b/ma_dsn.c
index c84b8435..2d5f2169 100644
--- a/ma_dsn.c
+++ b/ma_dsn.c
@@ -82,11 +82,11 @@ MADB_DsnKey DsnKeys[]=
   {"FORWARDONLY",    offsetof(MADB_Dsn, ForceForwardOnly),  DSN_TYPE_OPTION, MADB_OPT_FLAG_FORWARD_CURSOR, 0},
   {"COMPAT_MODE",    offsetof(MADB_Dsn, CompatMode),        DSN_TYPE_BOOL,   0, 0}, /* MYSQL_COMPATIBILITY_MODE */
   {"NO_SSPS",        offsetof(MADB_Dsn, NoSsps),            DSN_TYPE_BOOL,   0, 0},
-  {"NO_CACHE",       offsetof(MADB_Dsn, NoCache),           DSN_TYPE_OPTION, MADB_OPT_FLAG_NO_CACHE, 0},
+  {"NO_CACHE",       offsetof(MADB_Dsn, NoCache),           DSN_TYPE_OPTION, MADB_OPT_FLAG_NO_CACHE, 0},  /* 40 */
   {"APP",            offsetof(MADB_Dsn, App),               DSN_TYPE_STRING, 0, 0},
-  /* SSO parameters */
+  /* SSO/JWT parameters */
   {"BROWSER_SSO",    offsetof(MADB_Dsn, IsBrowserAuth),     DSN_TYPE_BOOL  , 0, 0},
-  {"IGNORE_KEYRING_SSO", offsetof(MADB_Dsn, IgnoreKeyring),      DSN_TYPE_BOOL  , 0, 0},
+  {"IGNORE_KEYRING_SSO", offsetof(MADB_Dsn, IgnoreKeyring), DSN_TYPE_BOOL  , 0, 0},
   {"JWT",            offsetof(MADB_Dsn, JWT),               DSN_TYPE_STRING, 0, 0},
   {"TEST_MODE",      offsetof(MADB_Dsn, TestMode),          DSN_TYPE_INT,    0, 0}, /* Use some mock functions for testing */
   /* Aliases. Here offset is index of aliased key */