Index: setupgui/callbacks.c
===================================================================
--- setupgui/callbacks.c	(revision 1006)
+++ setupgui/callbacks.c	(working copy)
@@ -81,9 +81,16 @@
   SQLWCHAR    szCatalog[MYODBC_DB_NAME_MAX];
   SQLLEN      nCatalog;
   LIST *dbs= NULL;
+  SQLWCHAR    preserve= params->database ? params->database[0] : 0;
 
+  if (params->database)
+    params->database[0]= 0;
+
   nReturn= Connect(&hDbc, &hEnv, params);
 
+  if (params->database)
+    params->database[0]= preserve;
+
   if (nReturn != SQL_SUCCESS)
     ShowDiagnostics(nReturn, SQL_HANDLE_DBC, hDbc);
   if (!SQL_SUCCEEDED(nReturn))