Index: drupalvb.admin-pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drupalvb/drupalvb.admin-pages.inc,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 drupalvb.admin-pages.inc
--- drupalvb.admin-pages.inc	15 Oct 2008 00:48:53 -0000	1.1.2.7
+++ drupalvb.admin-pages.inc	15 Oct 2008 01:26:41 -0000
@@ -127,10 +127,23 @@ function drupalvb_settings_database() {
 }
 
 function drupalvb_settings_database_submit($form_id, $form_values) {
+  $initial_import = FALSE;
+  // If there is no database configuration yet, we want to execute an initial
+  // user import later.
+  if (empty(variable_get('drupalvb_db', NULL))) {
+    $initial_import = TRUE;
+  }
+
   $url = $form_values['scheme'] .'://'. $form_values['user'] .':'. $form_values['pass'] .'@'. $form_values['host'] .'/'. $form_values['path'];
   variable_set('drupalvb_db', $url);
   variable_set('drupalvb_db_is_default', (is_array($GLOBALS['db_url']) ? $GLOBALS['db_url']['default'] == $url : $GLOBALS['db_url'] == $url));
   variable_set('drupalvb_db_prefix', $form_values['db_prefix']);
+
+  if ($initial_import) {
+    // First time setup; initialize DrupalvB's user mapping.
+    require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';
+    _drupalvb_init_user_map();
+  }
 }
 
 /**
Index: drupalvb.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drupalvb/drupalvb.inc,v
retrieving revision 1.6.2.7
diff -u -p -r1.6.2.7 drupalvb.inc
--- drupalvb.inc	5 Jul 2008 00:37:02 -0000	1.6.2.7
+++ drupalvb.inc	15 Oct 2008 01:22:38 -0000
@@ -177,7 +177,7 @@ function db_last_insert_id($table, $fiel
  * Note: We can't do this in a single query, because Drupal's and vB's tables
  * need not to be in the same database.
  *
- * @see drupalvb.install
+ * @see drupalvb.admin-pages.inc
  */
 function _drupalvb_init_user_map() {
   $users = $vbusers = array();
Index: drupalvb.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drupalvb/drupalvb.install,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 drupalvb.install
--- drupalvb.install	16 Jul 2008 00:43:48 -0000	1.1.2.6
+++ drupalvb.install	15 Oct 2008 01:22:03 -0000
@@ -14,9 +14,6 @@ function drupalvb_install() {
           PRIMARY KEY (uid),
           UNIQUE userid (userid)
         ) /*!40100 DEFAULT CHARACTER SET utf8 */;");
-
-      require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';
-      _drupalvb_init_user_map();
       break;
   }
 }