diff --git a/modules/user.module b/modules/user.module
index 2647d7ab43ab..6de46309ace1 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -517,6 +517,7 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
       case 0:
         // For usability's sake, avoid showing two login forms on one page.
         if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) {
+          $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'));
@@ -591,15 +592,6 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
   }
 }
 
-
-
-function theme_user_login_block($form) {
-  $output = "<div class=\"user-login-block\">\n";
-  $output .= form_render($form);
-  $output .= "</div>\n";
-  return $output;
-}
-
 function theme_user_picture($account) {
   if (variable_get('user_pictures', 0)) {
     if ($account->picture && file_exists($account->picture)) {
diff --git a/modules/user/user.module b/modules/user/user.module
index 2647d7ab43ab..6de46309ace1 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -517,6 +517,7 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
       case 0:
         // For usability's sake, avoid showing two login forms on one page.
         if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) {
+          $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'));
@@ -591,15 +592,6 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
   }
 }
 
-
-
-function theme_user_login_block($form) {
-  $output = "<div class=\"user-login-block\">\n";
-  $output .= form_render($form);
-  $output .= "</div>\n";
-  return $output;
-}
-
 function theme_user_picture($account) {
   if (variable_get('user_pictures', 0)) {
     if ($account->picture && file_exists($account->picture)) {