diff --git a/misc/drupal.css b/misc/drupal.css
index be9923a6b88..160c7a7049e 100644
--- a/misc/drupal.css
+++ b/misc/drupal.css
@@ -75,7 +75,7 @@ th                        { text-align: left; padding-right: 1em; border-bottom:
 .ok                       { color: #080; }
 
 .user-login-block         { text-align: center; }
-
+.user-login-block, .user-information-block { white-space: nowrap; }
 tr.dark                   { background-color: #ddd; }
 tr.light                  { background-color: #eee; }
 pre                       { white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -o-pre-wrap; white-space: -pre-wrap;}
diff --git a/modules/user.module b/modules/user.module
index 0e03f6e8173..fbba36e143e 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -388,19 +388,21 @@ function user_block($op = "list", $delta = 0) {
           $output .= theme("theme_item_list", $items);
 
           $block["subject"] = t("User login");
-          $block["content"] = "<div style=\"white-space: nowrap;\">$output</div>";
+          $block["content"] = $output;
           return $block;
         }
         break;
       case 1:
         if ($user->uid) {
+          $output = "<div class=\"user-information-block\">\n";
           $output .= theme("theme_menu_list", module_invoke_all("link", "menu.create"));
           $output .= theme("theme_menu_list", module_invoke_all("link", "menu.view"));
           $output .= theme("theme_menu_list", module_invoke_all("link", "menu.settings"));
           $output .= theme("theme_menu_list", module_invoke_all("link", "menu.misc"));
+          $output .= "</div>\n";
 
           $block["subject"] = $user->name;
-          $block["content"] = "<div style=\"white-space: nowrap;\">$output</div>";
+          $block["content"] = $output;
           return $block;
         }
         break;
diff --git a/modules/user/user.module b/modules/user/user.module
index 0e03f6e8173..fbba36e143e 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -388,19 +388,21 @@ function user_block($op = "list", $delta = 0) {
           $output .= theme("theme_item_list", $items);
 
           $block["subject"] = t("User login");
-          $block["content"] = "<div style=\"white-space: nowrap;\">$output</div>";
+          $block["content"] = $output;
           return $block;
         }
         break;
       case 1:
         if ($user->uid) {
+          $output = "<div class=\"user-information-block\">\n";
           $output .= theme("theme_menu_list", module_invoke_all("link", "menu.create"));
           $output .= theme("theme_menu_list", module_invoke_all("link", "menu.view"));
           $output .= theme("theme_menu_list", module_invoke_all("link", "menu.settings"));
           $output .= theme("theme_menu_list", module_invoke_all("link", "menu.misc"));
+          $output .= "</div>\n";
 
           $block["subject"] = $user->name;
-          $block["content"] = "<div style=\"white-space: nowrap;\">$output</div>";
+          $block["content"] = $output;
           return $block;
         }
         break;