--- user.module	Wed Oct 20 16:32:38 2004
+++ drupal-4.5.0/modules/user.module	Wed Oct 20 16:34:44 2004
@@ -782,7 +782,7 @@ function user_login($edit = array(), $ms
   else if ($edit['name'] && $edit['pass']) {
 
     if (!$user->uid) {
-      $user = user_authenticate($edit['name'], $edit['pass']);
+      $user = user_authenticate($edit['name'], trim($edit['pass']));
     }
 
     if ($user->uid) {
@@ -1108,6 +1108,8 @@ function user_edit_validate($uid, &$edit
 
   // If required, check that proposed passwords match.  If so, add the new password to $edit.
   if ($edit['pass1']) {
+    $edit['pass1'] = trim($edit['pass1']);
+    $edit['pass2'] = trim($edit['pass2']);
     if ($edit['pass1'] == $edit['pass2']) {
       $edit['pass'] = $edit['pass1'];
     }