Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.475
diff -u -r1.475 user.module
--- modules/user.module	24 May 2005 06:00:22 -0000	1.475
+++ modules/user.module	24 May 2005 18:05:34 -0000
@@ -1088,7 +1088,8 @@
   // Account information:
   $group  = form_textfield(t('Username'), 'name', $edit['name'], 30, 55, t('Your full name or your preferred username: only letters, numbers and spaces are allowed.'), NULL, TRUE);
   $group .= form_textfield(t('E-mail address'), 'mail', $edit['mail'], 30, 55, t('Insert a valid e-mail address.  All e-mails from the system will be sent to this address. The e-mail address is not made public and will only be used if you wish to receive a new password or wish to receive certain news or notifications by e-mail.'), NULL, TRUE);
-  $group .= form_item(t('Password'), '<input type="password" class="form-password" name="edit[pass1]" size="12" maxlength="24" /> <input type="password" class="form-password" name="edit[pass2]" size="12" maxlength="24" />', t('Enter your new password twice if you want to change your current password, or leave it blank if you are happy with your current password.'), NULL, TRUE);
+  $group .= form_password(t('Password'), 'pass1', $edit['pass1'], 12, 24, t('Enter your new password if you want to change your current password, or leave it blank if you are happy with your current password.'));
+  $group .= form_password(t('Password'), 'pass2', $edit['pass2'], 12, 24, t('Confirm you new password, if you want to change your current password.'));
 
   if (user_access('administer users')) {
     $group .= form_radios(t('Status'), 'status', $edit['status'], array(t('Blocked'), t('Active')));
@@ -1661,7 +1662,7 @@
         $rows[] = array($role->name, '<span class="disabled">'. t('locked') .'</span>');
       }
     }
-    $rows[] = array('<input type="text" size="32" maxlength="64" name="edit[name]" />', '<input type="submit" name="op" value="'. t('Add role') .'" />');
+    $rows[] = array(form_textfield(t('Role name'), 'name', '', 32, 64),form_submit(t('Add role')));
 
     $output = theme('table', $header, $rows);
     $output = form($output);