Index: modules/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact.module,v
retrieving revision 1.6.2.2
diff -u -r1.6.2.2 contact.module
--- modules/contact.module	17 Aug 2005 00:56:13 -0000	1.6.2.2
+++ modules/contact.module	11 Nov 2005 14:04:33 -0000
@@ -52,8 +52,9 @@
 
 function contact_mail_user() {
   global $user;
-
-  if ($account = user_load(array('uid' => arg(1), 'status' => 1))) {
+  $account = user_load(array('uid' => arg(1), 'status' => 1));
+  
+  if ($account->uid) {
     if (!$account->contact && !user_access('administer users')) {
       $output = t('%name is not accepting e-mails.', array('%name' => $account->name));
     }
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.485.2.14
diff -u -r1.485.2.14 node.module
--- modules/node.module	9 Sep 2005 06:14:24 -0000	1.485.2.14
+++ modules/node.module	11 Nov 2005 14:04:33 -0000
@@ -1227,11 +1227,14 @@
       // are dealing with an anonymous user we set the user ID to 0.
       $node->uid = 0;
     }
-    else if ($account = user_load(array('name' => $node->name))) {
-      $node->uid = $account->uid;
-    }
     else {
-      form_set_error('name', t('The username %name does not exist.', array ('%name' => theme('placeholder', $node->name))));
+      $account = user_load(array('name' => $node->name));
+      if ($account->uid) {
+        $node->uid = $account->uid;
+      }
+      else {
+        form_set_error('name', t('The username %name does not exist.', array ('%name' => theme('placeholder', $node->name))));
+      }
     }
 
     // Validate the "authored on" field.
@@ -1463,7 +1466,8 @@
     if (isset($node->name)) {
       // The use of isset() is mandatory in the context of user IDs, because
       // user ID 0 denotes the anonymous user.
-      if ($user = user_load(array('name' => $node->name))) {
+      $user = user_load(array('name' => $node->name));
+      if ($user->uid) {
         $node->uid = $user->uid;
       }
       else {
Index: modules/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics.module,v
retrieving revision 1.186.2.5
diff -u -r1.186.2.5 statistics.module
--- modules/statistics.module	31 May 2005 21:13:39 -0000	1.186.2.5
+++ modules/statistics.module	11 Nov 2005 14:04:33 -0000
@@ -192,7 +192,8 @@
 }
 
 function statistics_user_tracker() {
-  if ($account = user_load(array('uid' => arg(1)))) {
+  $account = user_load(array('uid' => arg(1)));
+  if ($account->uid) {
 
     $header = array(
         array('data' => t('Timestamp'), 'field' => 'timestamp', 'sort' => 'desc'),
Index: modules/tracker.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker.module,v
retrieving revision 1.114.2.1
diff -u -r1.114.2.1 tracker.module
--- modules/tracker.module	14 May 2005 17:13:30 -0000	1.114.2.1
+++ modules/tracker.module	11 Nov 2005 14:04:33 -0000
@@ -58,7 +58,8 @@
  * Menu callback. Prints a listing of active nodes on the site.
  */
 function tracker_track_user() {
-  if ($account = user_load(array('uid' => arg(1)))) {
+  $account = user_load(array('uid' => arg(1)));
+  if ($account->uid) {
     drupal_set_title($account->name);
     tracker_page($account->uid);
   }
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.454.2.20
diff -u -r1.454.2.20 user.module
--- modules/user.module	7 Oct 2005 06:54:27 -0000	1.454.2.20
+++ modules/user.module	11 Nov 2005 14:04:33 -0000
@@ -913,14 +913,21 @@
 function user_pass() {
   global $base_url;
   $edit = $_POST['edit'];
+  $account = user_load(array('name' => $edit['name'], 'status' => 1));
 
-  if ($edit['name'] && !($account = user_load(array('name' => $edit['name'], 'status' => 1)))) {
-    form_set_error('name', t('Sorry. The username %name is not recognized.', array('%name' => theme('placeholder', $edit['name']))));
+  if ($edit['name']) {
+    $account = user_load(array('name' => $edit['name'], 'status' => 1));  
+    if (!$account->uid) {
+      form_set_error('name', t('Sorry. The username %name is not recognized.', array('%name' => theme('placeholder', $edit['name']))));
+    }
   }
-  else if ($edit['mail'] && !($account = user_load(array('mail' => $edit['mail'], 'status' => 1)))) {
-    form_set_error('mail', t('Sorry. The e-mail address %email is not recognized.', array('%email' => theme('placeholder', $edit['mail']))));
+  else if ($edit['mail']) {
+    $account = user_load(array('mail' => $edit['mail'], 'status' => 1));
+    if (!$account->uid) {
+      form_set_error('mail', t('Sorry. The e-mail address %email is not recognized.', array('%email' => theme('placeholder', $edit['mail']))));
+    }
   }
-  if ($account) {
+  if ($account->uid) {
     $from = variable_get('site_mail', ini_get('sendmail_from'));
     $pass = user_password();
 
@@ -945,9 +952,6 @@
     drupal_goto('user');
   }
   else {
-    if ($edit) {
-      drupal_set_message(t('You must provider either a username or e-mail address.'), 'error');
-    }
     // Display form:
     $output = '<p>'. t('Enter your username <strong><em>or</em></strong> your e-mail address.') .'</p>';
     $output .= form_textfield(t('Username'), 'name', $edit['name'], 30, 64);
@@ -1194,7 +1198,8 @@
 function user_view($uid = 0) {
   global $user;
 
-  if ($account = user_load(array('uid' => $uid, 'status' => 1))) {
+  $account = user_load(array('uid' => $uid, 'status' => 1));
+  if ($account->uid) {
     // Retrieve and merge all profile fields:
     $fields = array();
     foreach (module_list() as $module) {