--- installer/myodbc3i.c	(revision 596)
+++ installer/myodbc3i.c	(working copy)
@@ -446,20 +446,8 @@
     MYODBCUTIL_DATASOURCE *pDataSource = MYODBCUtilAllocDataSource( MYODBCUTIL_DATASOURCE_MODE_DSN_VIEW );
 
     /* set scope */
-    switch ( nScope )
-    {
-        case ODBC_BOTH_DSN:
-            if ( !SQLSetConfigMode( nScope ) )
-                return FALSE;
-            break;
-        case ODBC_USER_DSN:
-        case ODBC_SYSTEM_DSN:
-            if ( !SQLSetConfigMode( nScope ) )
-                return FALSE;
-            break;
-        default:
-            return FALSE;
-    }
+    if ( !SQLSetConfigMode( nScope ) )
+        return FALSE;
 
     if ( !MYODBCUtilReadDataSource( pDataSource, pszName ) )
     {
@@ -565,6 +553,15 @@
         return 0;
     }
 
+    switch (cObjectSub) {
+    case 'u':
+      if (!SQLSetConfigMode(ODBC_USER_DSN))
+        return FALSE;
+    case 's':
+      if (!SQLSetConfigMode(ODBC_SYSTEM_DSN))
+        return FALSE;
+    }
+
     /*
         Create a oopy of pszAttributes where the ';' are replaced
         with '\0' and ensure that at least 2 '\0' are at the end.