remove pre auth, add auth user in $account object in email validation code

I'm using the 'Set password & Immediate login' setting

I want to let pre-authorized users know that they have a limited access until fully authorized so i'm setting a warning message each time they log in. I'm doing this with the code below:

function preauthenticated_user($op, &$edit, &$user_edit, $category = NULL) {
	global $user;
	if ($op == 'login') {
              // the new role i've set for pre authenticated users is 'preauthenticated', this is rid 5
              if ($user->roles[5] == 'preauthenticated'){
				$message .= 'the message here';
				drupal_set_message(t($message));
    }
  }
}

This works fine and every time you log in without authenticating your email by clicking on the emailed link you get the above message. When you click on the link you get the 'You have successfully validated your e-mail address.' message, but also get the above message. All future logins are back to normal as an authenticated user and you don't get my custom message anymore.

It seems that as logintoboggan fires the 'You have successfully validated your e-mail address.' message it has not yet updated the user's role, so my custom message is also being set. Is there a way in which i can change my detection of pre-authenticated users so that it isn't set on the validation successful page.