--- a/modules/user/user.module	Tue Dec 23 14:30:28 2008 +0100
+++ b/modules/user/user.module	Tue Dec 23 14:32:08 2008 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: user.module,v 1.892.2.5 2008/07/09 21:48:28 goba Exp $
+// $Id: user.module,v 1.892.2.6 2008/08/12 05:11:22 dries Exp $
 
 /**
  * @file
@@ -1387,8 +1387,11 @@
 function user_external_login_register($name, $module) {
   global $user;
 
-  $user = user_load(array('name' => $name));
-  if (!isset($user->uid)) {
+  $existing_user = user_load(array('name' => $name));
+  if (isset($existing_user->uid)) {
+    $user = $existing_user;
+  }
+  else {
     // Register this new user.
     $userinfo = array(
       'name' => $name,