diff --git a/modules/user.module b/modules/user.module
index eb7044b6e38..6a4b176a00a 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -682,6 +682,8 @@ function user_login($edit = array(), $msg = "") {
   }
   $output .= theme("item_list", $items);
 
+  $output  = form_group(t('User login'), $output);
+
   return form($output, "post", url("user"));
 }
 
@@ -768,7 +770,7 @@ function user_pass($edit = array()) {
       $items[] = l(t("Create new account"), "user/register");
     }
     $output .= theme("item_list", $items);
-
+    $output  = form_group(t('Request new password'), $output);
     return form($output, "post", url("user"));
   }
 }
@@ -897,6 +899,7 @@ function user_register($edit = array()) {
   $items[] = l(t("Request new password"), "user/password");
   $items[] = l(t("Log in"), "user/login");
   $output .= theme("item_list", $items);
+  $output  = form_group(t('Create new user account'), $output);
 
   return form($output);
 }
@@ -1032,11 +1035,11 @@ function user_view($uid = 0) {
     print theme("page", $output, $account->name);
   }
   else {
-    $output = theme("box", t("User login"), user_login());
+    $output = user_login();
     if (variable_get("user_register", 1)) {
-      $output .= theme("box", t("Create new user account"), user_register());
+      $output .= user_register();
     }
-    $output .= theme("box", t("Request new password"), user_pass());
+    $output .= user_pass();
 
     print theme("page", $output, t("User login"));
   }
diff --git a/modules/user/user.module b/modules/user/user.module
index eb7044b6e38..6a4b176a00a 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -682,6 +682,8 @@ function user_login($edit = array(), $msg = "") {
   }
   $output .= theme("item_list", $items);
 
+  $output  = form_group(t('User login'), $output);
+
   return form($output, "post", url("user"));
 }
 
@@ -768,7 +770,7 @@ function user_pass($edit = array()) {
       $items[] = l(t("Create new account"), "user/register");
     }
     $output .= theme("item_list", $items);
-
+    $output  = form_group(t('Request new password'), $output);
     return form($output, "post", url("user"));
   }
 }
@@ -897,6 +899,7 @@ function user_register($edit = array()) {
   $items[] = l(t("Request new password"), "user/password");
   $items[] = l(t("Log in"), "user/login");
   $output .= theme("item_list", $items);
+  $output  = form_group(t('Create new user account'), $output);
 
   return form($output);
 }
@@ -1032,11 +1035,11 @@ function user_view($uid = 0) {
     print theme("page", $output, $account->name);
   }
   else {
-    $output = theme("box", t("User login"), user_login());
+    $output = user_login();
     if (variable_get("user_register", 1)) {
-      $output .= theme("box", t("Create new user account"), user_register());
+      $output .= user_register();
     }
-    $output .= theme("box", t("Request new password"), user_pass());
+    $output .= user_pass();
 
     print theme("page", $output, t("User login"));
   }