From 8c1560c75694a701a5fce69d0b5b2c19dd218678 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 3 Aug 2006 14:08:30 +0000
Subject: [PATCH] - Forgot this with last commit.

---
 includes/form.inc | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/includes/form.inc b/includes/form.inc
index 9aae8e49a0b..5d838002f86 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -839,15 +839,23 @@ function theme_radios($element) {
  *   A themed HTML string representing the form item.
  */
 function theme_password_confirm($element) {
-  return theme('form_element', $element, '<div class="container-inline">'. $element['#children'] .'</div>');
+  return theme('form_element', $element, $element['#children']);
 }
 
 /*
  * Expand a password_confirm field into two text boxes.
  */
 function expand_password_confirm($element) {
-  $element['pass1'] =  array('#type' => 'password', '#size' => 12, '#value' => $element['#value']['pass1']);
-  $element['pass2'] =  array('#type' => 'password', '#size' => 12, '#value' => $element['#value']['pass2']);
+  $element['pass1'] =  array(
+    '#type' => 'password',
+    '#title' => t('Password'),
+    '#value' => $element['#value']['pass1'],
+  );
+  $element['pass2'] =  array(
+    '#type' => 'password',
+    '#title' => t('Confirm password'),
+    '#value' => $element['#value']['pass2'],
+  );
   $element['#validate'] = array('password_confirm_validate' => array());
   $element['#tree'] = TRUE;