diff --git a/misc/drupal.css b/misc/drupal.css
index e35454bdc39..840398666e1 100644
--- a/misc/drupal.css
+++ b/misc/drupal.css
@@ -452,7 +452,7 @@ img.screenshot {
 #tracker table {
   width: 100%;
 }
-.user-login-block {
+#user-login-form {
   text-align: center;
 }
 .more-help-link {
diff --git a/modules/forum.module b/modules/forum.module
index 7a60101c1e5..3fd8a55b87f 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -319,7 +319,7 @@ function _forum_get_vid() {
  */
 function forum_admin_configure() {
   system_settings_save();
-  
+
   $output .= form_textfield(t('Forum icon path'), 'forum_icon_path', variable_get('forum_icon_path', ''), 30, 255, t('The path to the forum icons.  Leave blank to disable icons. Don\'t add a trailing slash.  Default icons are available in the "misc" directory. You may use images of whatever size you wish, but it is recommended to use 15x15 or 16x16. '));
   $number = drupal_map_assoc(array(5, 10, 15, 20, 25, 30, 35, 40, 50, 60, 80, 100, 10000));
   $output .= form_select(t('Hot topic threshold'), 'forum_hot_topic', variable_get('forum_hot_topic', 15), $number, t('The number of posts a topic must have to be considered hot.'));
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 7a60101c1e5..3fd8a55b87f 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -319,7 +319,7 @@ function _forum_get_vid() {
  */
 function forum_admin_configure() {
   system_settings_save();
-  
+
   $output .= form_textfield(t('Forum icon path'), 'forum_icon_path', variable_get('forum_icon_path', ''), 30, 255, t('The path to the forum icons.  Leave blank to disable icons. Don\'t add a trailing slash.  Default icons are available in the "misc" directory. You may use images of whatever size you wish, but it is recommended to use 15x15 or 16x16. '));
   $number = drupal_map_assoc(array(5, 10, 15, 20, 25, 30, 35, 40, 50, 60, 80, 100, 10000));
   $output .= form_select(t('Hot topic threshold'), 'forum_hot_topic', variable_get('forum_hot_topic', 15), $number, t('The number of posts a topic must have to be considered hot.'));
diff --git a/modules/user.module b/modules/user.module
index f03d8a57e33..7d6efb7f08d 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -517,8 +517,6 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
         if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) {
           $edit = $_POST['edit'];
 
-          $output = "<div class=\"user-login-block\">\n";
-
           // NOTE: special care needs to be taken because on pages with forms,
           // such as node and comment submission pages, the $edit variable
           // might already be set.
@@ -526,9 +524,8 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
           $output .= form_textfield(t('Username'), 'name', $edit['name'], 15, 64);
           $output .= form_password(t('Password'), 'pass', '', 15, 64);
           $output .= form_submit(t('Log in'));
-          $output .= "</div>\n";
 
-          $output  = form($output, 'post', url('user/login', drupal_get_destination()));
+          $output  = form($output, 'post', url('user/login', drupal_get_destination()), array('id' => 'user-login-form'));
 
           if (variable_get('user_register', 1)) {
             $items[] = l(t('Create new account'), 'user/register', array('title' => t('Create a new user account.')));
diff --git a/modules/user/user.module b/modules/user/user.module
index f03d8a57e33..7d6efb7f08d 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -517,8 +517,6 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
         if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) {
           $edit = $_POST['edit'];
 
-          $output = "<div class=\"user-login-block\">\n";
-
           // NOTE: special care needs to be taken because on pages with forms,
           // such as node and comment submission pages, the $edit variable
           // might already be set.
@@ -526,9 +524,8 @@ function user_block($op = 'list', $delta = 0, $edit = array()) {
           $output .= form_textfield(t('Username'), 'name', $edit['name'], 15, 64);
           $output .= form_password(t('Password'), 'pass', '', 15, 64);
           $output .= form_submit(t('Log in'));
-          $output .= "</div>\n";
 
-          $output  = form($output, 'post', url('user/login', drupal_get_destination()));
+          $output  = form($output, 'post', url('user/login', drupal_get_destination()), array('id' => 'user-login-form'));
 
           if (variable_get('user_register', 1)) {
             $items[] = l(t('Create new account'), 'user/register', array('title' => t('Create a new user account.')));