Index: modules/logintoboggan/logintoboggan.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/logintoboggan/logintoboggan.module,v
retrieving revision 1.7.2.56
diff -u -r1.7.2.56 logintoboggan.module
--- modules/logintoboggan/logintoboggan.module	1 Nov 2006 02:08:07 -0000	1.7.2.56
+++ modules/logintoboggan/logintoboggan.module	21 Nov 2006 19:03:23 -0000
@@ -865,6 +865,18 @@
   } elseif ($op == 'login' && variable_get('login_successful', 0)) {
     drupal_set_message(t('Login successful.'));
   }
+  elseif ($op == 'load') {
+    // Just loaded the user into $user_edit.
+    // If the user has the pre-auth role, unset the authenticated role
+    $id = logintoboggan_validating_id();
+    $in_pre_auth_role = in_array($id, array_keys($user_edit->roles));
+    if ($user_edit->uid && $in_pre_auth_role) {
+      $user_edit->status = 1;
+      if ($id != DRUPAL_AUTHENTICATED_RID) {
+        unset($user_edit->roles[DRUPAL_AUTHENTICATED_RID]);
+      }
+    }    
+  }
 }
 
 /**
