diff --git a/includes/form.inc b/includes/form.inc
index 8f28d303e0794c2389fd070310a34a4018173bef..d0a72c9b9c2a5c68db2b5da2a98e4ffd281d596b 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -1348,9 +1348,10 @@ function theme_markup($element) {
 */
 function theme_password($element) {
   $size = $element['#size'] ? ' size="'. $element['#size'] .'" ' : '';
+  $maxlength = $element['#maxlength'] ? ' maxlength="'. $element['#maxlength'] .'" ' : '';
 
   _form_set_class($element, array('form-text'));
-  $output = '<input type="password" maxlength="'. $element['#maxlength'] .'" name="'. $element['#name'] .'" id="'. $element['#id'] .'" '. $size . drupal_attributes($element['#attributes']) .' />';
+  $output = '<input type="password" name="'. $element['#name'] .'" id="'. $element['#id'] .'" '. $maxlength . $size . drupal_attributes($element['#attributes']) .' />';
   return theme('form_element', $element, $output);
 }