--- user.module.orig	2006-02-03 19:39:48.000000000 +0100
+++ user.module	2006-02-03 19:33:14.000000000 +0100
@@ -524,7 +524,6 @@ function user_block($op = 'list', $delta
         // For usability's sake, avoid showing two login forms on one page.
         if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) {
           $form['#action'] = url($_GET['q'], drupal_get_destination());
-          $form['#attributes'] = array('id' => 'user-login-form');
           $form['name'] = array('#type' => 'textfield', '#title' => t('Username'), '#maxlength' => 64, '#size' => 15);
           $form['pass'] = array('#type' => 'password', '#title' => t('Password'), '#maxlength' => 64, '#size' => 15);
           $form['submit'] = array('#type' => 'submit', '#value' => t('Log in'));
@@ -535,7 +534,7 @@ function user_block($op = 'list', $delta
           $items[] = l(t('Request new password'), 'user/password', array('title' => t('Request new password via e-mail.')));
           $form['links'] = array('#value' => theme('item_list', $items));
 
-          $output .= drupal_get_form('user_login_block', $form, 'user_login');
+          $output .= drupal_get_form('user-login-form', $form, 'user_login');
 
           $block['subject'] = t('User login');
           $block['content'] = $output;