--- user.module.old	2005-08-28 13:52:06.000000000 -0500
+++ user.module	2005-08-28 13:49:20.000000000 -0500
@@ -871,15 +871,16 @@
 
   // Try each external authentication source in series. Register user if
   // successful.
-  else if (!$user->uid && $server) {
+  else if (!$user->uid) {
     foreach (module_list() as $module) {
       if (module_hook($module, 'auth')) {
         if (module_invoke($module, 'auth', $name, $pass, $server)) {
           if (variable_get('user_register', 1) == 1) {
-            $account = user_load(array('name' => "$name@$server"));
+            $username = ($server != '') ? "$name@$server" : $name;
+            $account = user_load(array('name' => $username));
             if (!$account->uid) { // Register this new user.
-              $user = user_save('', array('name' => "$name@$server", 'pass' => user_password(), 'init' => "$name@$server", 'status' => 1, "authname_$module" => "$name@$server", 'roles' => array(_user_authenticated_id())));
-              watchdog('user', t('New external user: %user using module %module.', array('%user' => theme('placeholder', $name .'@'. $server), '%module' => theme('placeholder', $module))), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $user->uid .'/edit'));
+              $user = user_save('', array('name' => $username, 'pass' => user_password(), 'init' => $username, 'status' => 1, "authname_$module" => $username, 'roles' => array(_user_authenticated_id())));
+              watchdog('user', t('New external user: %user using module %module.', array('%user' => theme('placeholder', $username), '%module' => theme('placeholder', $module))), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $user->uid .'/edit'));
               break;
             }
           }