--- user.module.old	2005-07-25 21:38:30.000000000 +0100
+++ user.module.new	2005-07-28 16:36:53.824216000 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: user.module,v 1.492 2005/07/25 20:38:30 unconed Exp $
+// $Id: user.module,v 1.491 2005/07/23 05:53:43 dries Exp $
 
 /**
  * @file
@@ -57,8 +57,8 @@ function user_load($array = array()) {
       $params[] = $value;
     }
     else {
-      $query .= "LOWER(u.$key) = LOWER('%s') AND ";
-      $params[] = $value;
+      $query .= "LOWER(u.$key) = '%s' AND ";
+      $params[] = strtolower($value);
     }
   }
   $result = db_query_range("SELECT u.* FROM {users} u WHERE $query u.status < 3", $params, 0, 1);
@@ -209,7 +209,7 @@ function user_save($account, $array = ar
  * Verify the syntax of the given name.
  */
 function user_validate_name($name) {
-  if (!$name) return t('You must enter a username.');
+  if (!strlen($name)) return t('You must enter a username.');
   if (substr($name, 0, 1) == ' ') return t('The username cannot begin with a space.');
   if (substr($name, -1) == ' ') return t('The username cannot end with a space.');
   if (ereg('  ', $name)) return t('The username cannot contain multiple spaces in a row.');